[med-svn] [emperor] 11/15: Merge branch 'upstream'

[Afif Elghraoui]

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

afif pushed a commit to branch master
in repository emperor.

commit ed7d1701cd6a0e0f8ae1ccd414495f5062c114c3
Merge: 247c8fb ab01959
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Wed Oct 12 23:12:15 2016 -0700

    Merge branch 'upstream'


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