X-Git-Url: https://codewiz.org/gitweb?p=wiki.git;a=blobdiff_plain;f=Affiliations;h=3f75b45ba47ac7c88ddfe6bbdd3b79d93271d48f;hp=782c625717939d30f430d638c24c6f4da984b4d6;hb=cb69d86e0b6d64f3a02b9b5ff1567e13107fb9d4;hpb=554c47a1bf04ca7fb3449959ac58cf47a4436a6d

diff --git a/Affiliations b/Affiliations
index 782c625..3f75b45 100644
--- a/Affiliations
+++ b/Affiliations
@@ -1,21 +1,53 @@
-Infrastructure Team coordinator, member of the Oversight Board, [[http://wiki.sugarlabs.org/ | Sugar Labs]]
+== Current Affiliations ==
+
+Coordinator of the Infrastructure Team, member of the Oversight Board, [[http://wiki.sugarlabs.org/ | Sugar Labs]]
 
 [[http://wiki.sugarlabs.org/ | http://static.sugarlabs.org/images/sugarlabs_trac_logo.png]]
 
 ----
 
-System Administrator Intern, [[http://fsf.org/ | Free Software Foundation]]
+Software Engineer, [[http://www.google.com/|Google Inc.]]
+
+[[http://www.google.com/ | http://www.google.com/images/logos/google_logo_41.png]]
+
+----
+
+Senior Systems Administrator, [[http://fsf.org/ | Free Software Foundation]]
 
 [[http://fsf.org/ | http://static.fsf.org/fsforg/img/logo-new.png]]
 
 ----
 
-Founder, [[http://www.develer.com/ | Develer s.r.l. ]]
+Release Manager, [[ http://paraguayeduca.org | Paraguay Educa ]]
 
-[[http://www.develer.com/ | http://www.develer.com/pics/develer_logo_alpha.png]]
+[[http://paraguayeduca.org | ParaguayEduca.jpg ]]
 
 ----
 
 Proven Packager, Sponsor, [[http://www.fedoraproject.org/ | Fedora Project]]
 
 [[http://fedoraproject.org | http://fedoraproject.org/w/uploads/thumb/2/2d/Logo_fedoralogo.png/320px-Logo_fedoralogo.png ]]
+
+----
+
+Founder, [[http://www.develer.com/ | Develer s.r.l. ]]
+
+[[http://www.develer.com/ | http://www.develer.com/pics/develer_logo_alpha.png]]
+
+----
+
+Contributor, former System Architect, [[http://www.bertos.org/ | BeRTOS]]
+
+[[http://www.bertos.org | http://www.bertos.org/media/web-stuff/avatars/bertos-en.png]]
+
+----
+
+Maintainer, [[http://gcc.gnu.org/ | GNU C Compiler]]
+
+[[http://gcc.gnu.org/ | http://upload.wikimedia.org/wikipedia/commons/c/c4/GCC_logo.png]]
+
+== Former Affiliations ==
+
+ * Contributor, [[http://uclinux.org/ | uClinux]]
+
+ * Developer, [[http://laptop.org/ | OLPC]]