[fiona] 14/19: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-grass/fiona

[Johan Van de Wauw]

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

johanvdw-guest pushed a commit to branch master
in repository fiona.

commit 66f1b5c4044eb3e2b2873047fd8c2edf8da6aa51
Merge: de73985 d81be2f
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Thu Nov 27 19:55:11 2014 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-grass/fiona
    
    Conflicts:
    	debian/control

 debian/control | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)


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