[osmium] 05/07: Merge tag 'upstream/0.0_20160425-e2e4368'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osmium.

commit 15bc26538b76e7ea729880c4dbc56c55000328d0
Merge: d6eefdf 35363f6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu May 5 13:34:57 2016 +0200

    Merge tag 'upstream/0.0_20160425-e2e4368'
    
    Upstream version 0.0~20160425-e2e4368

 test/temp_file_fixture.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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