Merge branch 'master' into lugmap.linux.it

Conflicts:
	ToDo

db/toscana.txt

@@ -9,7 +9,6 @@ Grosseto|GuruAtWork|Grosseto e provincia|http://www.guruatwork.com/|yhqjvt.onetn
 Livorno|Gulli|Livorno e provincia|http://linux.livorno.it/|cerfvqragr@yvahk.yvibeab.vg|2098656759
 Lucca|Lucca Lug|Lucca|http://www.luccalug.it/|znggrb156@tznvy.pbz
 Lucca - Massa Carrara|ACROS|Versilia, Lucca, Massa Carrara|http://lug-acros.org/|pz@znahnyvahk.pbz|2098656669
-Massa e Carrara|Massa LUG|Massa|http://massalinux.altervista.org/|znffnyvahk@ivetvyvb.vg|
 Pisa|Gulp|Pisa|http://www.gulp.linux.it/|thyc@thyc.yvahk.vg|2098656760
 Pisa|T-OSSLab|Navacchio|http://www.tosslab.it/|vasb@gbffyno.vg|2098656831
 Pistoia|PtLug|Pistoia|http://www.ptlug.org/|cgyht-pbafvtyvb@yvfgf.cgyht.bet