[imposm] 06/27: Merge tag 'upstream/2.6.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 4157b35d3a6dc5a59b1ae6fda43791e65e43a442
Merge: 99b4296 16c8789
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Aug 31 13:15:10 2015 +0200

    Merge tag 'upstream/2.6.0'
    
    Upstream version 2.6.0

 CHANGES                                 |    13 +
 PKG-INFO                                |    17 +-
 imposm.egg-info/PKG-INFO                |    17 +-
 imposm.egg-info/SOURCES.txt             |     1 +
 imposm.egg-info/entry_points.txt        |     2 +-
 imposm/app.py                           |    17 +-
 imposm/cache/internal.cc                |   545 +-
 imposm/cache/tc.c                       | 12531 +++++++++++++++++++-----------
 imposm/db/config.py                     |     7 +
 imposm/db/postgis.py                    |    76 +-
 imposm/dbimporter.py                    |    55 +-
 imposm/defaultmapping.py                |    27 +-
 imposm/geom.py                          |    76 +-
 imposm/mapping.py                       |    48 +-
 imposm/multipolygon.py                  |    80 +-
 imposm/test/test_large_limit_to_geom.py |    42 +
 imposm/test/test_tag_mapper.py          |    46 +-
 imposm/util/geom.py                     |    27 +-
 imposm/version.py                       |     2 +-
 19 files changed, 8755 insertions(+), 4874 deletions(-)

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