Merge branch 'master' into lugmap.linux.it

Conflicts: ToDo
Gelma · Oct 25, 2012 · c9e056e · c9e056e
2 parents f9d031a + 9aae839
commit c9e056e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/db/Italia.txt b/db/Italia.txt
@@ -1,4 +1,3 @@
-Italia|Associazione Software Libero|Italia|http://softwarelibero.it/|eramb@pf.havob.vg
 Italia|FSUG Italia|Italia|http://www.fsugitalia.org/|cbfgznfgre@sfhtvgnyvn.bet
 Italia|ILS: Italian Linux Society|Italia|http://www.linux.it/|zq@yvahk.vg
 Italia|LibrePlanet Italia|Italia|http://libreplanet.org/wiki/Group:LibrePlanet_Italia|tahgbb@ab-ybt.bet

diff --git a/db/campania.txt b/db/campania.txt
@@ -5,7 +5,6 @@ Caserta|LUG Manzoni|Caserta|http://lugmanzoni.wordpress.com/|fny_@yvoreb.vg
 Napoli|IGLUG|Napoli e provincia|http://www.iglug.org/|vasb@vtyht.bet
 Napoli|Lug Ischia|Ischia|http://www.lug-ischia.org/|tvnaavpbccn@lnubb.vg
 Napoli|MSACK Hacklab|Napoli|http://msack.org/|zfnpx@cnenabvpv.bet
-Napoli|Mudilab|San Giorgio a Cremano|http://www.mudilab.eu/|vasb@zhqvyno.rh
 Napoli|NaLug|Napoli e provincia|http://www.nalug.net/|tvnasv@tznvy.pbz
 Salerno|GuruLug|Sapri|http://gurulug.wordpress.com/|i.prynab@tznvy.pbz
 Salerno|HCSSLUG|Salerno e provincia|http://www.hcsslug.org/|qfynxl@tznvy.pbz