[imposm] 27/47: Merge tag 'upstream/2.4.0'

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository imposm.

commit 2c4ae834dd341f6a02c2f52383d236a861e33747
Merge: c0f620a e81c95e
Author: David Paleino <dapal at debian.org>
Date:   Sun Apr 8 09:11:01 2012 +0200

    Merge tag 'upstream/2.4.0'
    
    Upstream version 2.4.0
    # gpg: Signature made dom 08 apr 2012 09:10:58 CEST using DSA key ID 1392B174
    # gpg: Good signature from "David Paleino <d.paleino at gmail.com>"
    # gpg:                 aka "[jpeg image of size 6708]"
    # gpg:                 aka "Hanska <aksnah at gmail.com>"
    # gpg:                 aka "David Paleino <david.paleino at poste.it>"
    # gpg:                 aka "David Paleino <dapal at debian.org>"

 CHANGES                     |   15 +
 PKG-INFO                    |   17 +-
 imposm.egg-info/PKG-INFO    |   17 +-
 imposm.egg-info/SOURCES.txt |    3 +
 imposm/app.py               |   25 +-
 imposm/cache/kc.c           | 9966 +++++++++++++++++++++++++++++++++++++++++++
 imposm/cache/osm.py         |   10 +-
 imposm/cache/tc_tmp.py      |  577 +++
 imposm/config.py            |   12 +
 imposm/db/postgis.py        |   89 +-
 imposm/dbimporter.py        |   10 +-
 imposm/defaultmapping.py    |   12 +-
 imposm/geom.py              |   32 +-
 imposm/mapping.py           |  111 +-
 imposm/psqldb.py            |   11 +
 imposm/test/test_cache.py   |   27 +-
 imposm/test/test_geom.py    |   33 +
 imposm/util.py              |   18 +-
 imposm/version.py           |    2 +-
 19 files changed, 10927 insertions(+), 60 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm.git