[sosi2osm] 09/19: Merge branch 'master' into debian

[Ruben Undheim]

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

rubund-guest pushed a commit to branch master
in repository sosi2osm.

commit 10ffc0a08036f8164251a088cd4a9ed669df1ab9
Merge: 7a52713 105b920
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Thu Sep 4 21:05:40 2014 +0000

    Merge branch 'master' into debian

 Makefile     | 15 ++++++++++-
 sosi2osm.cpp |  2 +-
 tag.cpp      | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 3 files changed, 87 insertions(+), 13 deletions(-)

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