[routino] 02/04: Merge tag 'upstream/3.1.1'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository routino.

commit 46ebf5dd65976311d4f77367378728e24db6b05e
Merge: 466d5ea 8326e74
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Mar 11 13:58:54 2016 +0100

    Merge tag 'upstream/3.1.1'
    
    Upstream version 3.1.1

 ChangeLog            | 11 ++++++++++-
 doc/NEWS.txt         |  9 +++++++++
 doc/README.txt       |  1 +
 doc/html/readme.html | 14 +++++++++++++-
 src/version.h        |  4 ++--
 5 files changed, 35 insertions(+), 4 deletions(-)

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