[nik4] 02/05: Merge tag 'upstream/1.6'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository nik4.

commit cef1fa672d4d539469b227b554ed57e353a52df1
Merge: e08f65b bb3b900
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jun 1 10:32:31 2016 +0200

    Merge tag 'upstream/1.6'
    
    Upstream version 1.6

 CHANGELOG.md |  3 ++-
 nik4.py      | 22 +++++++++++-----------
 setup.py     |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

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