Merge branch 'master' into lugmap.linux.it

Conflicts: ToDo
Gelma · Nov 11, 2014 · a5efee5 · a5efee5
2 parents 42bbfa9 + fbf0b06
commit a5efee5
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/db/sardegna.txt b/db/sardegna.txt
@@ -1,3 +1,4 @@
 Cagliari|GULCh|Provincia di Cagliari|http://www.gulch.it/|cnbyb.pbegvf@tznvy.pbz
 Nuoro|GULMh|Macomer (Marghine della Sardegna)|http://www.gulmh.org|fynlre86@gvfpnyv.vg
 Oristano|GNUraghe|Oristano e provincia|http://www.gnuraghe.org/|tvhyvb.beeh@tznvy.pbz
+Sassari|Plugs|Sassari e provincia|http://www.plugs.it/|vasb@cyhtf.vg