[fyba] 47/77: Merge branch 'master' into debian

[Ruben Undheim]

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

rubund-guest pushed a commit to branch master
in repository fyba.

commit 98d94a7c386fee10b9b4427cf0957eb079f2e5f6
Merge: 071ddc7 0dd1779
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Thu Sep 4 19:26:13 2014 +0000

    Merge branch 'master' into debian

 doc/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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