[gdal-grass] 01/05: Merge branch 'master' into experimental

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository gdal-grass.

commit a2310d62be753e28248d9f10719739ebc49b6c1f
Merge: 7d947d3 818df27
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Feb 6 15:58:41 2016 +0100

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/control

 debian/changelog  | 19 +++++++++++++++++--
 debian/control    |  6 +++---
 debian/control.in |  4 ++--
 debian/gbp.conf   |  2 +-
 debian/rules      |  4 ++++
 5 files changed, 27 insertions(+), 8 deletions(-)


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