[routino] 01/01: Merge branch 'master' of ssh://git.debian.org/srv/git.debian.org/git/pkg-grass/routino

[Uwe Steinmann]

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

steinm-guest pushed a commit to annotated tag debian/2.7.2-3
in repository routino.

commit 1bc992280030e8829e3219a26a8ce130353bc383
Merge: 1a0d53e 2c57673
Author: Uwe Steinmann <steinm at debian.org>
Date:   Mon Dec 8 09:51:17 2014 +0100

    Merge branch 'master' of ssh://git.debian.org/srv/git.debian.org/git/pkg-grass/routino
    
    Conflicts:
    	debian/changelog

 debian/changelog         | 11 +++++++++++
 debian/control           | 30 +++++++++++++++++++-----------
 debian/patches/hardening | 23 +++++++++++++++++++++++
 debian/patches/series    |  1 +
 4 files changed, 54 insertions(+), 11 deletions(-)

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