Skip to content

Commit

Permalink
Merge branch 'master' into lugmap.linux.it
Browse files Browse the repository at this point in the history
Conflicts:
	ToDo
  • Loading branch information
Gelma committed Feb 28, 2012
2 parents 4630141 + f85076a commit 5fce44d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions db/lazio.txt
Expand Up @@ -4,6 +4,7 @@ Latina|LLG|Latina|http://www.llg.it/|naqern.yvoenyngb@tznvy.pbz
Rieti|Lug Rieti|Rieti e provincia|http://www.lugrieti.net/|izpyrev@gvfpnyvarg.vg
Roma|Linux Club Italia|Roma|http://linux-club.org/|vasb@yvahkpyho.vg
Roma|LSLug - La Sapienza Linux User Group|Roma|http://www.ls-lug.org/|fncvramnyht@tznvy.pbz
Roma|Lug Roma TRE|Roma|http://www.lugroma3.org/|tenareb@cnyngvab.vg
Roma|Roma2LUG|Tor Vergata|http://lug.uniroma2.it/|ebzn2yht@tznvy.pbz
Roma|SabaziaLug|Anguillara Sabazia e Bracciano|http://www.sabazialug.org/|re.onvgpu@gva.vg
Roma|Linux4Campagnano|Campagnano di Roma|http://www.linux4campagnano.net/|n.fpngbyvav@pbzharpnzcntanab.vg
Expand Down
1 change: 1 addition & 0 deletions db/piemonte.txt
@@ -1,6 +1,7 @@
Alessandria|AlLug|Alessandria e provincia|http://www.alessandria.linux.it/|qbabgjnyxbagurtenff@tznvy.pbz
Asti|Progetto Radis|Asti|http://www.progettoradis.it/|bfpne.cnfgebar@gva.vg
Biella|BiLug|Provincia di Biella|http://www.bilug.linux.it/|znaserqb@tnohoov.vg
Cuneo|GlugCN|Cuneo|http://cuneo.linux.it/|zryynab@tznvy.pbz
Cuneo, Torino|ABC Lug|Alba, Bra, Carmagnola|http://abc.linux.it/|tbfzneqv@yvahk.vg
Novara|Gallug|Galliate|http://www.gallug.it/|snovb.zz@tznvy.pbz
Novara|LiNOx|Novara|http://linoxnovara.wordpress.com/|yvabkabinen@tznvy.pbz
Expand Down

0 comments on commit 5fce44d

Please sign in to comment.