[osmcoastline] 02/05: Merge tag 'upstream/2.1.1'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osmcoastline.

commit d8d098a39b3b591129a5c1f62cb027c88bde35b4
Merge: 603dcca 2e10bf9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Aug 31 16:02:52 2015 +0200

    Merge tag 'upstream/2.1.1'
    
    Upstream version 2.1.1

 CHANGELOG.md           | 10 +++++++-
 CMakeLists.txt         |  4 +--
 cmake/FindOsmium.cmake | 69 ++++++++++++++++++++------------------------------
 3 files changed, 39 insertions(+), 44 deletions(-)

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