[libmatio] 46/48: Merge branch 'upstream'

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository libmatio.

commit 5c2794237ed29dd2f8cd18a983674abe154209b0
Merge: 3d6d901 a172edb
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Fri Jan 15 17:38:49 2016 +0100

    Merge branch 'upstream'


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