Edit page Affiliations

[wiki.git] / Affiliations

diff --git a/Affiliations b/Affiliations
index ddbae93b5f529c878e2d60d3a6334c7609a910fb..186a81879fd3df9595042c2e7c5b634272336596 100644 (file)
--- a/Affiliations
+++ b/Affiliations
@@ -1,20 +1,21 @@
 == Current Affiliations ==
 
-Infrastructure Team coordinator, member of the Oversight Board, [[http://wiki.sugarlabs.org/ | Sugar Labs]]
+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://fsf.org/ | http://static.fsf.org/fsforg/img/logo-new.png]]
+[[http://www.google.com/ | http://www.google.com/images/logos/google_logo_41.png]]
 
 ----
 
-Founder, [[http://www.develer.com/ | Develer s.r.l. ]]
 
-[[http://www.develer.com/ | http://www.develer.com/pics/develer_logo_alpha.png]]
+Release Manager, [[ http://paraguayeduca.org | Paraguay Educa ]]
+
+[[http://paraguayeduca.org | ParaguayEduca.jpg ]]
 
 ----
 
@@ -24,12 +25,32 @@ Proven Packager, Sponsor, [[http://www.fedoraproject.org/ | Fedora Project]]
 
 ----
 
+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]]
+Senior Systems Administrator, [[http://fsf.org/ | Free Software Foundation]]
+
+[[http://fsf.org/ | http://static.fsf.org/fsforg/img/logo-new.png]]
+
+----
+
+Contributor, [[http://uclinux.org/ | uClinux]]
+
+----
 
- * Developer, [[http://laptop.org/ | OLPC]]
+Operating System Engineer (volunteer), [[http://laptop.org/ | One Laptop Per Child]]
\ No newline at end of file