Merge branch 'master' into lugmap.linux.it

Conflicts: ToDo
Gelma · Jan 17, 2012 · 9231ddd · 9231ddd
2 parents 8f9b24c + d7ee504
commit 9231ddd
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/db/Italia.txt b/db/Italia.txt
@@ -1,5 +1,4 @@
 Italia|FSUG Italia|Italia|http://www.fsugitalia.org/|cbfgznfgre@shftvgnyvn.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|tenmvnab@vairagngv.bet
-Italia|P.l.u.t.o.|Italia|http://www.pluto.it/|avpx@yvahk.vg
 Italia|Slacky|Italia|http://www.slacky.eu/|fynpxl@fynpxl.vg