[qrupdate] 05/06: Merge branch 'upstream'

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository qrupdate.

commit 35bde2e975ab04dd86bb5b46238ed218aea2f2f5
Merge: 23c6b49 1344f04
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Sat Oct 29 23:46:33 2016 +0200

    Merge branch 'upstream'


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