[LugMap] [Gelma/LugMap] 6f0a74: ToDo: http://www.tvlug.it/ torna online

[GitHub]

  Branch: refs/heads/lugmap.linux.it
  Home:   https://github.com/Gelma/LugMap
  Commit: 6f0a74be8319dcb05e0a5cc65d5cdee0ad4206f2
      https://github.com/Gelma/LugMap/commit/6f0a74be8319dcb05e0a5cc65d5cdee0ad4206f2
  Author: Andrea Gelmini <andrea.gelmini@gelma.net>
  Date:   2012-10-22 (Mon, 22 Oct 2012)

  Changed paths:
    M ToDo

  Log Message:
  -----------
  ToDo: http://www.tvlug.it/ torna online


  Commit: b90dd03dfb8ec7100bd581f2eec825b39a5813ec
      https://github.com/Gelma/LugMap/commit/b90dd03dfb8ec7100bd581f2eec825b39a5813ec
  Author: Andrea Gelmini <andrea.gelmini@gelma.net>
  Date:   2012-10-22 (Mon, 22 Oct 2012)

  Changed paths:
    M ToDo
    M db/lazio.txt

  Log Message:
  -----------
  db: viene ripristinato http://linux-club.org/


  Commit: f9d031a1e477e81fc9f13f109141639d8beb00d0
      https://github.com/Gelma/LugMap/commit/f9d031a1e477e81fc9f13f109141639d8beb00d0
  Author: Andrea Gelmini <andrea.gelmini@gelma.net>
  Date:   2012-10-22 (Mon, 22 Oct 2012)

  Changed paths:
    M db/lazio.txt

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

Conflicts:
	ToDo


Compare: https://github.com/Gelma/LugMap/compare/8b996f6f0430...f9d031a1e477