[med-svn] [python-mne] 02/02: Merge tag '0.7.2' into debian

[Yaroslav Halchenko]

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

yoh pushed a commit to branch master
in repository python-mne.

commit bfcbbc8acbea95db8a13db0b80e5bfe9a4d6da28
Merge: e1d7015 9059428
Author: Yaroslav Halchenko <debian at onerussian.com>
Date:   Mon Jan 13 19:44:33 2014 -0500

    Merge tag '0.7.2' into debian
    
    Upstream version 0.7.2
    
    * tag '0.7.2':
      Imported Upstream version 0.7.2

 doc/Makefile                         | 13 +++++-
 doc/source/_templates/layout.html    |  9 ++--
 doc/source/_templates/sidebar.html   |  5 +++
 doc/source/conf.py                   |  7 +++-
 doc/sphinxext/gen_rst.py             | 24 ++++++-----
 doc/upload_html.sh                   |  4 +-
 mne/fiff/brainvision/brainvision.py  | 29 +++++++++----
 mne/fiff/tag.py                      |  9 ++--
 mne/forward/forward.py               |  4 +-
 mne/gui/_file_traits.py              |  2 +-
 mne/gui/tests/test_coreg_gui.py      | 81 ++++++++++++++++++------------------
 mne/tests/test_epochs.py             |  2 +-
 mne/time_frequency/tests/test_csd.py | 16 +++----
 mne/utils.py                         | 12 ++++--
 14 files changed, 130 insertions(+), 87 deletions(-)

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/python-mne.git