[silo-llnl] 14/21: Merge branch 'debian/master' into dev-python3

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository silo-llnl.

commit d7545836afef18513c1bddbe3f3960b4e5eebff1
Merge: f5a0506 7ae8810
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Aug 5 01:49:07 2016 +0100

    Merge branch 'debian/master' into dev-python3

 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

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