[med-svn] [python-mne] 258/353: Merge pull request #65 from christianmbrodbeck/cmb-epochs-average-fix

[Yaroslav Halchenko]

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

yoh pushed a commit to tag 0.4
in repository python-mne.

commit 775e8974d4e590042bb5bb0869ffa843c1fb9a61
Merge: 7accfa6 9ae6870
Author: Alexandre Gramfort <alexandre.gramfort at inria.fr>
Date:   Wed Jul 11 07:43:17 2012 -0700

    Merge pull request #65 from christianmbrodbeck/cmb-epochs-average-fix
    
    Epochs.average() fix

 .gitignore                     |  1 +
 doc/source/python_tutorial.rst |  4 ++--
 mne/epochs.py                  |  5 ++++-
 mne/tests/test_epochs.py       | 11 ++++++-----
 4 files changed, 13 insertions(+), 8 deletions(-)

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