[libm4rie] 01/11: Merge remote-tracking branch 'origin/master'

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository libm4rie.

commit f99c2b5062effa897bc0074a73127b9fcb702449
Merge: 3d1da9b 3cc7dfd
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Oct 15 23:42:36 2014 +0200

    Merge remote-tracking branch 'origin/master'

 debian/watch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libm4rie.git