[med-svn] [python-mne] 03/04: Merge tag 'upstream/0.8.3+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 28c89bd57963d1e47d0b93eedae8678e5d3c78c0
Merge: 1532144 8e4ae89
Author: Yaroslav Halchenko <debian at onerussian.com>
Date:   Sun Sep 21 23:49:57 2014 +0200

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

 doc/source/python_reference.rst      | 30 ++++++++++++++++++++++++++++--
 mne/__init__.py                      |  2 +-
 mne/channels.py                      |  9 +++++++--
 mne/time_frequency/__init__.py       |  1 +
 mne/time_frequency/tests/test_tfr.py | 16 ++++++++++++++++
 mne/time_frequency/tfr.py            |  5 ++++-
 6 files changed, 57 insertions(+), 6 deletions(-)

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