[osmium-tool] 10/11: Merge tag 'upstream/1.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 osmium-tool.

commit 99a9001a9090463299727c29036d07481796a479
Merge: 4da6501 41f01ee
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jul 4 16:39:45 2015 +0200

    Merge tag 'upstream/1.1.1'
    
    Upstream version 1.1.1

 CHANGELOG.md             |  13 +++-
 CMakeLists.txt           |   2 +-
 src/command_fileinfo.cpp |   4 +-
 zsh_completion/_osmium   | 162 +++++++++++++++++++++--------------------------
 4 files changed, 85 insertions(+), 96 deletions(-)

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