[libcitygml] 06/35: Merge tag 'upstream/1.2.1'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository libcitygml.

commit 1bd386526ad22aa9c985221f31734a2aa59db92b
Merge: edd4670 c62bd2a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 24 16:29:26 2015 +0200

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1


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