[pktools] 160/375: Merge branch 'master' of git.sv.gnu.org:/srv/git/pktools

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch upstream-master
in repository pktools.

commit e41b72b48bdb63050b14c56c9a931c5e2563f23a
Merge: ce69ad4 c21d18e
Author: Pieter Kempeneers <kempenep at gmail.com>
Date:   Wed Dec 18 21:29:04 2013 +0100

    Merge branch 'master' of git.sv.gnu.org:/srv/git/pktools

 ChangeLog             | 2 ++
 doc/mainpage.dox      | 6 +++---
 src/apps/pklas2img.cc | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

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