X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=Affiliations;h=69fde34ecbcd41a4f8b5ab2034221140020988f4;hb=005ab45f91fcd1b95d6bbd2203ecfeed4d4f3825;hp=1a55b7eb2055f900b5136aa6074e7b989d719b08;hpb=7df5e71b716a89a624b47a9d8459a99bb4a2e5d3;p=wiki.git

diff --git a/Affiliations b/Affiliations
index 1a55b7e..69fde34 100644
--- a/Affiliations
+++ b/Affiliations
@@ -1,35 +1,67 @@
 == 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]]
+Member, [[https://fsf.org/ | Free Software Foundation]]
 
-[[http://fsf.org/ | http://static.fsf.org/fsforg/img/logo-new.png]]
+[[https://fsf.org/ | https://static.fsf.org/fsforg/img/logo-new.png]]
 
 ----
 
-Founder, [[http://www.develer.com/ | Develer s.r.l. ]]
+Proven Packager, Sponsor, [[http://www.fedoraproject.org/ | Fedora Project]]
 
-[[http://www.develer.com/ | http://www.develer.com/pics/develer_logo_alpha.png]]
+[[https://fedoraproject.org | https://fedoraproject.org/w/uploads/thumb/2/2d/Logo_fedoralogo.png/320px-Logo_fedoralogo.png ]]
 
 ----
 
-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 ]]
+----
+
+Lead Architect, [[https://github.com/develersrl/bertos | BeRTOS]]
+
+[[https://github.com/develersrl/bertos | http://www.bertos.org/media/bertos/avatars/bertos-en.png]]
 
 ----
 
-Maintainer, [[http://gcc.gnu.org/ | GNU C Compiler]]
+Maintainer, [[https://gcc.gnu.org/ | GNU C Compiler]]
+
+[[https://gcc.gnu.org/ | https://upload.wikimedia.org/wikipedia/commons/thumb/a/af/GNU_Compiler_Collection_logo.svg/102px-GNU_Compiler_Collection_logo.svg.png]]
+
+== Former Affiliations ==
+
+Senior Software Engineer, [[https://careers.google.com/locations/tokyo/ | Google Japan]]
+
+Senior Software Engineer, [[https://careers.google.com/locations/cambridge/ | Google Cambridge]]
+
+[[https://www.google.com/ | GoogleLogoAlpha.png]]
+
+
+Senior Systems Administrator, [[http://fsf.org/ | Free Software Foundation]]
+
+[[https://fsf.org/ | http://static.fsf.org/fsforg/img/logo-new.png]]
+
+
+Co-Founder, [[https://www.develer.com/ | Develer s.r.l.]]
+
+[[https://www.develer.com/ | develer-logo.png]]
+
+
+Release Manager, [[ http://paraguayeduca.org | Paraguay Educa ]]
+
+[[http://paraguayeduca.org | paraguay-educa-logo-small.png]]
+
+
+Linux Platform Engineer (full-time volunteer), [[http://laptop.org/ | One Laptop Per Child]]
 
-[[http://gcc.gnu.org/ | http://upload.wikimedia.org/wikipedia/commons/c/c4/GCC_logo.png]]
+[[https://laptop.org/ | OlpcLogoAlpha.png]]
 
-== Past Affiliations ==
 
- * Contributor, uClinux
+Contributor, [[http://uclinux.org/ | uClinux]]
 
- * Developer, OLPC
+[[http://www.uclinux.org/ | uclinux-logo.png]]
\ No newline at end of file