[pktools] 320/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 1d70ad124a2f7b01a824e61e6e0a3de996b4500e
Merge: b9007e5 f42a103
Author: Pieter Kempeneers <kempenep at gmail.com>
Date:   Fri Sep 12 19:02:14 2014 +0200

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

 src/apps/Makefile.am | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

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