projects
/
wiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Edit page Affiliations
[wiki.git]
/
Affiliations
diff --git
a/Affiliations
b/Affiliations
index cc8dad641904ee27c22b82d733bf9aeafa83d981..186a81879fd3df9595042c2e7c5b634272336596 100644
(file)
--- a/
Affiliations
+++ b/
Affiliations
@@
-6,15
+6,16
@@
Coordinator of the Infrastructure Team, member of the Oversight Board, [[http://
----
----
-
Pasante, [[ http://paraguayeduca.org | Paraguay Educa
]]
+
Software Engineer, [[http://www.google.com/|Google Inc.
]]
-[[http://
paraguayeduca.org | ParaguayEduca.jpg
]]
+[[http://
www.google.com/ | http://www.google.com/images/logos/google_logo_41.png
]]
----
----
-System Administrator Intern, Member, [[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 ]]
----
----
@@
-42,6
+43,14
@@
Maintainer, [[http://gcc.gnu.org/ | GNU C Compiler]]
== Former Affiliations ==
== 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