[med-svn] [amos] 04/08: Merge branch 'upstream'

[Afif Elghraoui]

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

afif-guest pushed a commit to branch master
in repository amos.

commit aaa5e5e1622f26675a7c896e57baed42ca348c28
Merge: 39e9019 83285f1
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Tue Aug 11 22:53:01 2015 -0700

    Merge branch 'upstream'


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