[med-svn] [python-mne] 02/03: Merge tag 'upstream/0.8.4+dfsg'

[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 ba374460c7aa40967757a1c7e1f8dc2d1d35c630
Merge: 4c5afd1 1a4470c
Author: Yaroslav Halchenko <debian at onerussian.com>
Date:   Wed Sep 24 08:03:06 2014 -0400

    Merge tag 'upstream/0.8.4+dfsg'
    
    Upstream version 0.8.4+dfsg
    
    * tag 'upstream/0.8.4+dfsg':
      Imported Upstream version 0.8.4+dfsg

 doc/source/python_reference.rst |  2 ++
 mne/__init__.py                 |  2 +-
 mne/gui/_file_traits.py         | 38 ++++++++++++++++++++------------------
 mne/io/base.py                  |  8 ++++----
 mne/io/edf/edf.py               |  4 ++--
 mne/report.py                   | 14 ++++++++------
 6 files changed, 37 insertions(+), 31 deletions(-)

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