[mapnik] 03/03: Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/mapnik

[Jérémy Lal]

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

kapouer pushed a commit to branch master
in repository mapnik.

commit 05c5a5d0c59b372b45623bbc51540a33f185cad0
Merge: 6491c87 d09ee3b
Author: Jérémy Lal <kapouer at melix.org>
Date:   Fri Jul 10 10:06:27 2015 +0200

    Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/mapnik

 debian/manpages/nik2img.1    | 62 ++++++++++++++++++++++++++++++++++++++++++++
 debian/mapnik-utils.manpages |  1 +
 2 files changed, 63 insertions(+)

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