[osmpbf] 02/03: Merge tag 'upstream/1.3.3' into debian

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch debian
in repository osmpbf.

commit e04402e80338aee804c92fedfb3e913eaedc7793
Merge: a54565e 75e6974
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Mar 15 22:18:53 2014 +0100

    Merge tag 'upstream/1.3.3' into debian
    
    Upstream version 1.3.3
    
    Conflicts:
    	debian/changelog
    	debian/control

 ReleaseNotes.txt        | 6 ++++++
 build.xml               | 6 ++----
 include/osmpbf/osmpbf.h | 2 +-
 pom.xml                 | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

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