Merge branch 'master' into lugmap.linux.it

db/Italia.txt

@@ -1,5 +1,4 @@
 Italia|Associazione Software Libero|Italia|http://softwarelibero.it/|eramb@pf.havob.vg
-Italia|FSUG Italia|Italia|http://www.fsugitalia.org/|cbfgznfgre@sfhtvgnyvn.bet
 Italia|ILS: Italian Linux Society|Italia|http://www.linux.it/|zq@yvahk.vg
 Italia|Industria Italiana del Software Libero|Italia|http://www.industriasoftwarelibero.it/|qnavryrzgr90@nyvpr.vg
 Italia|P.l.u.t.o.|Italia|http://www.pluto.it/|avpx@yvahk.vg

db/puglia.txt

@@ -1,10 +1,12 @@
 Bari|AUTLug|Conversano|https://www.facebook.com/pages/ARCI-AUT-Conversano/192505224187241|yhcb.ynherngb@ubgznvy.vg
 Bari|Linux Club Conversano|Conversano|http://lxcc.it.gg/|ykpp.vg.tt@tznvy.pbz|2098656789
 Bari|MurgiaLug|Santeramo in Colle|http://www.open-pc.eu/index.php/murgialug|senaprfpno.pvpr@bcra-cp.rh
+Barletta-Andria-Trani|Puglia Software Open Source|Barletta|http://www.pugliasos.it/|avpbyn.ynznppuvn@tznvy.pbz
 Brindisi|FareZero|Francavilla Fontana|http://www.farezero.it/|jvyyvnz-qbamryyv@ubgznvy.vg
 Foggia|DauniaLUG|Foggia, regione Daunia|http://daunialug.wordpress.com/|tvnzzlwrg@tznvy.pbz
 Foggia|ManfredoniaLUG|Manfredonia|http://manfredonialug.linux.it/|senaxfbsg1973@tznvy.pbz
 Lecce|Salento Open Source|Lecce e provincia|http://www.salentopensource.it|fbsgjneryvorebfnyragb@tznvy.pbz
 Lecce|SaLug|Lecce|http://salug.it/|vasb@fnyht.vg
 Taranto|MassLug|Massafra|http://masslug.wordpress.com/|znffnsenyht@tznvy.pbz|2098656816
 Taranto|Pane e PC|Taranto|http://www.paneepc.org/|s.frggrzoer@cnarrcp.bet
+Taranto|Club Informatici Tarantini|Taranto|https://www.facebook.com/groups/277558479099900|yhpntevyyb85@yvoreb.vg