X-Git-Url: https://codewiz.org/gitweb?p=wiki.git;a=blobdiff_plain;f=Affiliations;h=9ded0532a24c4a5459c4cf84d62fb24ce01a2237;hp=4537b2d9cd2b9b6df74ab05d7c5074d7a19fcd0d;hb=e3bb5755bfcbf5e0b0dc96c474923231e1a4e1bc;hpb=f29f804837802c84453e2f537809a61733c3ff22

diff --git a/Affiliations b/Affiliations
index 4537b2d..9ded053 100644
--- a/Affiliations
+++ b/Affiliations
@@ -1,21 +1,65 @@
-Infrastructure Team coordinator, member of the Oversight Board, [[http://wiki.sugarlabs.org/ | Sugar Labs]]
+== Current Affiliations ==
 
-{{http://static.sugarlabs.org/images/sugarlabs_trac_logo.png}}
+Software Engineer, [[https://careers.google.com/locations/tokyo/ | Google Japan]]
+
+[[https://www.google.com/ | GoogleLogoAlpha.png]]
 
 ----
 
-System administrator Intern, [[http://fsf.org/ | Free Software Foundation]]
+Coordinator of the Infrastructure Team, Member of the Oversight Board, [[http://wiki.sugarlabs.org/ | Sugar Labs]]
 
-{{http://static.fsf.org/fsforg/img/logo-new.png}}
+[[http://wiki.sugarlabs.org/ | http://static.sugarlabs.org/images/sugarlabs_trac_logo.png]]
 
 ----
 
-Founder, [[http://www.develer.com/ | Develer s.r.l.]]
+Member, [[https://fsf.org/ | Free Software Foundation]]
 
-{{http://www.develer.com/pics/develer_logo_alpha.png}}
+[[https://fsf.org/ | https://static.fsf.org/fsforg/img/logo-new.png]]
 
 ----
 
 Proven Packager, Sponsor, [[http://www.fedoraproject.org/ | Fedora Project]]
 
-{{https://fedoraproject.org/w/uploads/thumb/2/2d/Logo_fedoralogo.png/320px-Logo_fedoralogo.png}}
+[[https://fedoraproject.org | https://fedoraproject.org/w/uploads/thumb/2/2d/Logo_fedoralogo.png/320px-Logo_fedoralogo.png ]]
+
+----
+
+Founder, [[http://www.develer.com/ | Develer s.r.l.]]
+
+[[https://www.develer.com/ | https://www.develer.com/static/24cd940103cdcce952fb151fbc08e1bea2e14640/dist/logos-s110a2ffa1b.png]]
+
+----
+
+Contributor, former System Architect, [[https://github.com/develersrl/bertos | BeRTOS]]
+
+[[https://github.com/develersrl/bertos | http://www.bertos.org/media/bertos/avatars/bertos-en.png]]
+
+----
+
+Maintainer, [[https://gcc.gnu.org/ | GNU C Compiler]]
+
+[[https://gcc.gnu.org/ | http://gcc.gnu.org/img/gccegg-65.png]]
+
+== Former Affiliations ==
+
+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 ]]
+
+----
+
+Operating System Engineer (full-time volunteer), [[http://laptop.org/ | One Laptop Per Child]]
+
+[[http://laptop.org/ | OlpcLogoAlpha.png]]
+
+----
+
+Contributor, [[http://uclinux.org/ | uClinux]]
+
+[[https://uclinux.org/ | https://www.uclinux.org/images/logo.gif]]
\ No newline at end of file