[LugMap] [Gelma/LugMap] 6033ec: db: msack.org viene parcheggiato temporaneamente

[noreply@github.com]

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

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

  Changed paths:
    M ToDo
  M db/campania.txt

  Log Message:
  -----------
  db: msack.org viene parcheggiato temporaneamente


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

  Changed paths:
    M ToDo

  Log Message:
  -----------
  ToDo: pluto.it è fermo


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

  Changed paths:
    M db/campania.txt

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

Conflicts:
	ToDo
	script/spazzino.py


Compare: https://github.com/Gelma/LugMap/compare/d699bb3...2e0bc8f