Merge branch 'master' into lugmap.linux.it

Conflicts:
	ToDo

db/lombardia.txt

@@ -15,6 +15,7 @@ Milano|LIFOS|Cinisello Balsamo|http://www.lifos.org/|fnirevb.infncbyyb@tznvy.pbz
 Milano|Lug Bocconi|Milano|http://www.lugbocconi.org/|obppbyvahk@tznvy.pbz
 Milano|Lugdico|Milano|http://lugdico.wordpress.com/|naqern.geragvav@havzv.vg
 Milano|OpenLabs|Milano|http://www.openlabs.it/|nyoregb.pnzcvtyvb@tznvy.pbz
+Milano|PCOfficina|Milano|http://www.pcofficina.org/|oynpxqbbz.jvsv@tznvy.pbz
 Milano|POuL|Milano|http://www.poul.org/|qnavryrvnznegvab@tznvy.pbz
 Milano|ViGLug|Vignate|http://viglug.org/|sencu24@tznvy.pbz
 Monza|MoBLUG|Monza e Brianza|http://it-it.facebook.com/pages/MoBLUG-Monza-e-Brianza-Linux-Group/195366463068?sk=info|vasb@ohooyrfsnpgbel.vg