[frog] 97/103: Merge branch 'upstream'

[Joost van Baal]

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

joostvb pushed a commit to branch master
in repository frog.

commit 4c4ce28cebe1e981dc72faef0d831da825d86ea3
Merge: 957d710 83b9a55
Author: Joost van Baal-Ilić <joostvb at nusku.mdcc.cx>
Date:   Wed Sep 3 18:06:33 2014 +0200

    Merge branch 'upstream'


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