Merge branch 'master' into lugmap.linux.it

Conflicts:
	ToDo

db/piemonte.txt

@@ -8,7 +8,7 @@ Novara|LiNOx|Novara|http://linoxnovara.wordpress.com/|yvabkabinen@tznvy.pbz
 Torino|GlugTO|Torino e provincia|http://glugto.org/|gneqvgv.znffvzb@tznvy.pbz
 Torino|Underscore HackLab|Torino|http://www.autistici.org/underscore/|haqrefpber@nhgvfgvpv.bet
 Torino|Officina Informatica Libera|Torino|http://informaticalibera.info/|obo4wbo@tznvy.pbz
-Torino|Prometeo Libero|Torino|http://www.prometeolibero.eu/|senapvbanj@tznvy.pbz
+Torino|Prometeo Libero|Torino|http://www.openlabto.org/|senapvbanj@tznvy.pbz
 Torino|IvLug|Ivrea|http://www.ivlug.it/|q.yrfpn@fbyvabf.vg
 Torino|Accademia Hardware e Software Libero "Adriano Olivetti"|Ivrea|http://www.accademialiberaivrea.eu/|nppnqrzvnyvoren@tznvy.pbz
 Torino|SLIP|Pinerolo|http://pinerolo.linux.it/|vasb@fbsgjneryvorebcvarebyb.bet