[saods9] 07/07: Merge branch 'upstream' into debian

[Ole Streicher]

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

olebole-guest pushed a commit to branch debian
in repository saods9.

commit 08a41c4ffbf4ffdbc06fe465ead620d178e079b4
Merge: 255ced6 667a72a
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Sep 26 14:23:38 2013 +0200

    Merge branch 'upstream' into debian


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