[ismrmrd] 01/02: Merge tag 'upstream/1.2.1'

[Ghislain Vaillant]

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

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

commit 5c117c4849dba40ed92b97e5a46f69ca72ce2ed5
Merge: 387c1a0 487bca1
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri Jan 16 15:40:27 2015 +0000

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1

 CMakeLists.txt              |  2 +-
 bindings/python/.gitignore  |  3 +++
 bindings/python/MANIFEST.in |  3 +++
 bindings/python/README      |  1 +
 bindings/python/setup.py    | 49 ++++++++++++++++++++++++++++++++++++++++-----
 5 files changed, 52 insertions(+), 6 deletions(-)

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