[LugMap] [Gelma/LugMap] f7eb5e: Merge branch 'lugmap.linux.it' into banners

[noreply@github.com]

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

  Commit: f7eb5e9d1f47622e6c12edd53e0490f0c30e9409
      https://github.com/Gelma/LugMap/commit/f7eb5e9d1f47622e6c12edd53e0490f0c30e9409
  Author: Andrea Gelmini <andrea.gelmini@gelma.net>
  Date:   2011-08-30 (Tue, 30 Aug 2011)

  Changed paths:
    M funzioni.php
  M lug-o-matic/index.php
  M partecipa/index.php
  A propaganda/index.php

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


  Commit: b788cb046aa7946a41dda37ad8adaa0564d4822b
      https://github.com/Gelma/LugMap/commit/b788cb046aa7946a41dda37ad8adaa0564d4822b
  Author: Andrea Gelmini <andrea.gelmini@gelma.net>
  Date:   2011-08-30 (Tue, 30 Aug 2011)

  Changed paths:
    M guida/index.php

  Log Message:
  -----------
  Sito: Guida: corretto simboli in eccesso


  Commit: 754c56ed65a403cd4b90de3736a39227b093f7f7
      https://github.com/Gelma/LugMap/commit/754c56ed65a403cd4b90de3736a39227b093f7f7
  Author: Andrea Gelmini <andrea.gelmini@gelma.net>
  Date:   2011-08-30 (Tue, 30 Aug 2011)

  Changed paths:
    M propaganda/index.php

  Log Message:
  -----------
  Sito: aggiunti banner nella sezione propaganda


  Commit: c0dc377f4e5a5292351069ecfc02256df795e442
      https://github.com/Gelma/LugMap/commit/c0dc377f4e5a5292351069ecfc02256df795e442
  Author: Andrea Gelmini <andrea.gelmini@gelma.net>
  Date:   2011-08-30 (Tue, 30 Aug 2011)

  Changed paths:
    A banners/base_di_lavoro/banner_adsense/120x240.xcf
  A banners/base_di_lavoro/banner_adsense/120x600.xcf
  A banners/base_di_lavoro/banner_adsense/125x125.xcf
  A banners/base_di_lavoro/banner_adsense/160x600.xcf
  A banners/base_di_lavoro/banner_adsense/180x150.xcf
  A banners/base_di_lavoro/banner_adsense/200x200.xcf
  A banners/base_di_lavoro/banner_adsense/250x250.xcf
  A banners/base_di_lavoro/banner_adsense/300x250.xcf
  A banners/base_di_lavoro/banner_adsense/336x280.xcf
  A banners/base_di_lavoro/banner_adsense/468x60.xcf
  A banners/base_di_lavoro/banner_adsense/728x90.xcf
  A banners/base_di_lavoro/font/TwinPine/BILLY-ARGEL-TWINPINE-FONT.jpg
  A banners/base_di_lavoro/font/TwinPine/README.txt
  A banners/base_di_lavoro/font/TwinPine/TWINPINE.ttf
  A banners/base_di_lavoro/logo_ils.xcf
  A banners/base_di_lavoro/logo_lugmap_it.xcf
  A banners/logo_bob_e_LUG/200x200.png
  A banners/logo_bob_e_LUG/200x200.xcf
  A banners/logo_bob_e_LUG/468x60.png
  A banners/logo_bob_e_LUG/468x60.xcf
  A banners/logo_bob_e_LUG/728x90.png
  A banners/logo_bob_e_LUG/728x90.xcf
  A banners/logo_ils_e_LUG/200x200.png
  A banners/logo_ils_e_LUG/200x200.xcf
  A banners/logo_ils_e_LUG/200x200_bordato.png
  A banners/logo_ils_e_LUG/200x200_bordato.xcf
  A banners/logo_ils_e_LUG/468x60.png
  A banners/logo_ils_e_LUG/468x60.xcf
  A banners/logo_ils_e_LUG/468x60_bordato.png
  A banners/logo_ils_e_LUG/468x60_bordato.xcf
  A banners/logo_ils_e_LUG/728x90.png
  A banners/logo_ils_e_LUG/728x90.xcf
  A banners/logo_ils_e_LUG/728x90_bordato.png
  A banners/logo_ils_e_LUG/728x90_bordato.xcf
  M guida/index.php

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


Compare: https://github.com/Gelma/LugMap/compare/b879545...c0dc377