[pyosmium] 02/05: Merge tag 'upstream/2.5.4'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository pyosmium.

commit 7c3b411247dc4ff855eeaed2824b17c767577fd6
Merge: 25d9981 a98be7a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Dec 3 22:01:47 2015 +0100

    Merge tag 'upstream/2.5.4'
    
    Upstream version 2.5.4

 CHANGELOG.md | 11 ++++++++++-
 README.md    |  8 +++-----
 doc/conf.py  |  2 +-
 setup.py     |  2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

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