[osmium] 02/06: Merge tag 'upstream/0.0_20160124-b30afd3'

[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 da46c2f3d21409a86fe5b8092e5dfa2ea965eabe
Merge: f3fbd99 78faa27
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jan 24 17:30:59 2016 +0100

    Merge tag 'upstream/0.0_20160124-b30afd3'
    
    Upstream version 0.0~20160124-b30afd3

 test/t/osmfile/test_read_and_write.cpp | 16 ++++++++--------
 test/temp_file_fixture.hpp             |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

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