[rasterio] 08/08: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-grass/rasterio

[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 rasterio.

commit 99d634a1bc5d1fd69279f75369237b0078bd459b
Merge: 420008d c01133c
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Sat Nov 22 18:24:50 2014 +0100

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


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