[LugMap] [Gelma/LugMap] 1274bc: ToDo: riminilug.it torna online

[noreply@github.com]

  Branch: refs/heads/lugmap.linux.it
  Home:   https://github.com/Gelma/LugMap

  Commit: 1274bcfaf9bb834369d4134a0ba482b9948349c1
      https://github.com/Gelma/LugMap/commit/1274bcfaf9bb834369d4134a0ba482b9948349c1
  Author: Andrea Gelmini <andrea.gelmini@gelma.net>
  Date:   2011-11-18 (Fri, 18 Nov 2011)

  Changed paths:
    M ToDo

  Log Message:
  -----------
  ToDo: riminilug.it torna online

Revert "ToDo: riminilug non rispondono i DNS"

This reverts commit 29f9736a2670c31c42c9c712fc8340b9a2bce21e.


  Commit: efb40d56344caedc78ccc17a28257e5f841919be
      https://github.com/Gelma/LugMap/commit/efb40d56344caedc78ccc17a28257e5f841919be
  Author: Andrea Gelmini <andrea.gelmini@gelma.net>
  Date:   2011-11-20 (Sun, 20 Nov 2011)

  Changed paths:
    M db/campania.txt

  Log Message:
  -----------
  db: aggiunto MSACK hacklab

Pescato dalla pagina Hacklab di wikipedia.


  Commit: fa41cf93bc3d38f237ab4867b642c18cb396caa7
      https://github.com/Gelma/LugMap/commit/fa41cf93bc3d38f237ab4867b642c18cb396caa7
  Author: Andrea Gelmini <andrea.gelmini@gelma.net>
  Date:   2011-11-20 (Sun, 20 Nov 2011)

  Changed paths:
    M db/campania.txt

  Log Message:
  -----------
  Merge branch 'master' into lugmap.linux.it

Conflicts:
	ToDo


Compare: https://github.com/Gelma/LugMap/compare/5eecfbc...fa41cf9