[guidata] 01/02: Merge tag 'upstream/1.7.4'

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository guidata.

commit 0e70f290bb8685411e2e7acf26ca7e20475f1a82
Merge: 2066d85 bad0430
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Fri Dec 11 10:36:42 2015 +0100

    Merge tag 'upstream/1.7.4'
    
    Upstream version 1.7.4

 PKG-INFO                  |  2 +-
 changelog                 | 10 ++++++++++
 guidata.egg-info/PKG-INFO |  2 +-
 guidata/__init__.py       |  2 +-
 guidata/hdf5io.py         | 12 ++++++++----
 guidata/userconfig.py     | 22 ++++++++++++----------
 6 files changed, 33 insertions(+), 17 deletions(-)

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