X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=Affiliations;h=797fb82ad6f68a42f66d6638184d9285bc36c207;hb=efd6ea5ad6a9094e0d12837c7686d4aa95f4ffb6;hp=2f02f521e15ecd3398cb347681ef5defc1fdc762;hpb=ee75af4676b2bb377f684e86102de89ecb68c811;p=wiki.git

diff --git a/Affiliations b/Affiliations
index 2f02f52..797fb82 100644
--- a/Affiliations
+++ b/Affiliations
@@ -1,20 +1,20 @@
 == Current Affiliations ==
 
-Coordinator of the Infrastructure Team, 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]]
 
 ----
 
-Senior Systems Administrator, [[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/ | GoogleLogoAlpha.png]]
 
 ----
 
-Release Manager, [[ http://paraguayeduca.org | Paraguay Educa ]]
+Member, [[http://fsf.org/ | Free Software Foundation]]
 
-[[http://paraguayeduca.org | ParaguayEduca.jpg ]]
+[[http://fsf.org/ | http://static.fsf.org/fsforg/img/logo-new.png]]
 
 ----
 
@@ -24,7 +24,7 @@ Proven Packager, Sponsor, [[http://www.fedoraproject.org/ | Fedora Project]]
 
 ----
 
-Founder, [[http://www.develer.com/ | Develer s.r.l. ]]
+Founder, [[http://www.develer.com/ | Develer s.r.l.]]
 
 [[http://www.develer.com/ | http://www.develer.com/pics/develer_logo_alpha.png]]
 
@@ -42,6 +42,22 @@ Maintainer, [[http://gcc.gnu.org/ | GNU C Compiler]]
 
 == 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]]
+
+----
+
+Release Manager, [[ http://paraguayeduca.org | Paraguay Educa ]]
+
+[[http://paraguayeduca.org | ParaguayEduca.jpg ]]
+
+----
+
+Contributor, [[http://uclinux.org/ | uClinux]]
+
+[[http://uclinux.org/ | http://www.uclinux.org/images/logo.gif]]
+
+----
 
- * Developer, [[http://laptop.org/ | OLPC]]
+Operating System Engineer (volunteer), [[http://laptop.org/ | One Laptop Per Child]]
\ No newline at end of file