[h5py] 44/46: Merge branch 'upstream'

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository h5py.

commit 3c722c7bbb08ddef300f6aeb74b919233f67da48
Merge: d15c91e 66a0168
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Mar 24 18:32:15 2015 +0000

    Merge branch 'upstream'


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