[graywolf] 17/18: Merge branch 'upstream'

[Ruben Undheim]

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

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

commit b9f7d77551ed347625592dd3c10dab289b027997
Merge: c9c1543 956d833
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sun Jun 21 11:13:23 2015 +0200

    Merge branch 'upstream'


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