[LugMap] [Gelma/LugMap] 17cc91: Merge branch 'master' of github.com:Gelma/LugMap

[GitHub]

  Branch: refs/heads/lugmap.linux.it
  Home:   https://github.com/Gelma/LugMap
  Commit: 17cc912abd2ebe84bead81b7d36b9ef5ccb21617
      https://github.com/Gelma/LugMap/commit/17cc912abd2ebe84bead81b7d36b9ef5ccb21617
  Author: Roberto Guido <bob4job@gmail.com>
  Date:   2012-01-14 (Sat, 14 Jan 2012)

  Changed paths:
    M ToDo

  Log Message:
  -----------
  Merge branch 'master' of github.com:Gelma/LugMap


  Commit: a029e05583c6c78f887caa7e743887a1f9c796b6
      https://github.com/Gelma/LugMap/commit/a029e05583c6c78f887caa7e743887a1f9c796b6
  Author: Andrea Gelmini <andrea.gelmini@gelma.net>
  Date:   2012-01-15 (Sun, 15 Jan 2012)

  Changed paths:
    M db/emilia.txt

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

Conflicts:
	ToDo


  Commit: b0a95e1b098f999fdb263e7e0dccbe4299af7de6
      https://github.com/Gelma/LugMap/commit/b0a95e1b098f999fdb263e7e0dccbe4299af7de6
  Author: Andrea Gelmini <andrea.gelmini@gelma.net>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M ToDo
  M db/marche.txt

  Log Message:
  -----------
  ToDo: disabilitato temporaneamente pdp.linux.it

Accordato con loro l'attesa per lo spostamento al nuovo server


  Commit: af9e1cd065e04ebc94352639a12c13baa0a489cb
      https://github.com/Gelma/LugMap/commit/af9e1cd065e04ebc94352639a12c13baa0a489cb
  Author: Andrea Gelmini <andrea.gelmini@gelma.net>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M ToDo

  Log Message:
  -----------
  ToDo: completato rimozione pdp.linux.it


  Commit: daac4520e92981a34dc3b38f76db9656d6427649
      https://github.com/Gelma/LugMap/commit/daac4520e92981a34dc3b38f76db9656d6427649
  Author: Andrea Gelmini <andrea.gelmini@gelma.net>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M ToDo
  M db/Italia.txt

  Log Message:
  -----------
  db: pluto.it torna online

Revert "db: Disattivato temporaneamente Pluto.it"

This reverts commit fb2ee4e9af164e83c0982e70a904af8ad4575c15.

Conflicts:

	ToDo


  Commit: 08e1acbd051d35d4d73ae197156f6c4c260f8aa0
      https://github.com/Gelma/LugMap/commit/08e1acbd051d35d4d73ae197156f6c4c260f8aa0
  Author: Andrea Gelmini <andrea.gelmini@gelma.net>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M db/Italia.txt
  M db/marche.txt

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

Conflicts:
	ToDo


Compare: https://github.com/Gelma/LugMap/compare/4a95f32...08e1acb