[mbt] 74/80: 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 mbt.

commit ed8adc22b4be752f66b8a841f22bded61b9625db
Merge: b715eee 5f6b70c
Author: Joost van Baal-Ilić <joostvb at nusku.mdcc.cx>
Date:   Wed Sep 3 02:02:16 2014 +0200

    Merge branch 'upstream'


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