Merge branch 'master' into lugmap.linux.it

Conflicts: ToDo
Gelma · Mar 4, 2012 · c8d67ae · c8d67ae
2 parents 6d08184 + 178c7df
commit c8d67ae
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/db/calabria.txt b/db/calabria.txt
@@ -1,5 +1,4 @@
 Catanzaro|HackLab Catanzaro|Catanzaro|http://hacklab.cz/|wzvzzb82@tznvy.pbz
-Cosenza|3BYlug|Trebisacce|http://www.3bylug.tk/|3olyht@rznvy.vg
 Cosenza|Bogomips Lug|Bisignano e dintorni|http://www.blug.it/|vasb@oyht.vg
 Cosenza|CastroLug|Castrovillari e dintorni|http://castrolug.altervista.org/|pnfgebyht@tznvy.pbz
 Cosenza|CSLug|Cosenza|http://cslug.linux.it/|vasb@pfyht.yvahk.vg

diff --git a/db/piemonte.txt b/db/piemonte.txt
@@ -10,5 +10,6 @@ Torino|Underscore HackLab|Torino|http://www.autistici.org/underscore/|haqrefpber
 Torino|Officina Informatica Libera|Torino|http://informaticalibera.info/|obo4wbo@tznvy.pbz
 Torino|Prometeo Libero|Torino|http://www.prometeolibero.eu/|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
 Torino|ValSusinux|Avigliana, Val Susa e Val Sangone|http://www.valsusinux.it/|f.fnegber@svaqrearg.pbz