[osmctools] 02/12: Merge tag 'upstream/0.6'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osmctools.

commit 9c1c81dc151c31a716cbddc15d0dcbf06653d2c7
Merge: 0b5cc33 c84b631
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Feb 15 06:57:39 2016 +0100

    Merge tag 'upstream/0.6'
    
    Upstream version 0.6

 src/Makefile.am  |   4 +-
 src/osmconvert.c | 495 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 src/osmupdate.c  |   9 +-
 3 files changed, 472 insertions(+), 36 deletions(-)

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