Differences between revisions 11 and 12
Revision 11 as of 2013-05-30 03:05:04
Size: 2254
Editor: BrianGupta
Comment:
Revision 12 as of 2013-05-30 03:05:30
Size: 1651
Editor: BrianGupta
Comment:
Deletions are marked like this. Additions are marked like this.
Line 5: Line 5:
---- /!\ '''Edit conflict - other version:''' ----
=== Trusted Organizations (TOs) ===
 * [[http://www.spi-inc.org|Software in the Public Interest (SPI)]]
 * [[http://www.ffis.de|Förderung Freier Informationen & Software (ffis)]]
 * [[http://debian.ch|debian.ch]]

=== Affiliated Organizations
 * [[http://www.softwarelibero.it|Associazione per il Software Libero (ASL)]]
 * [[http://associacao.softwarelivre.org|Associação SoftwareLivre.org (ASL)]]
 * [[http://www.debian-es.org/|Debian-ES]]

---- /!\ '''Edit conflict - your version:''' ----
Line 26: Line 14:

---- /!\ '''End of edit conflict''' ----