[med-svn] [sphinxcontrib-autoprogram] 04/04: Merge branch 'upstream'

[Kevin Murray]

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

daube-guest pushed a commit to branch master
in repository sphinxcontrib-autoprogram.

commit f91dc47d4544c139a4e85303b46872f86d1b3c1c
Merge: 70e4011 cd68957
Author: Kevin Murray <spam at kdmurray.id.au>
Date:   Sun Jan 10 11:03:31 2016 +1100

    Merge branch 'upstream'


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/sphinxcontrib-autoprogram.git