[med-svn] [python-mne] 06/13: Merge tag 'upstream/0.10.1+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 3309f004b14d192f1fb4e5ff3b0ff30723142124
Merge: f236919 1c70a88
Author: jaeilepp <jaeilepp at student.jyu.fi>
Date:   Wed Nov 25 04:02:01 2015 -0500

    Merge tag 'upstream/0.10.1+dfsg'
    
    Upstream version 0.10.1+dfsg

 .mailmap                                       | 10 ++++++++
 .travis.yml                                    | 16 ++++++-------
 README.rst                                     |  2 +-
 appveyor.yml                                   |  3 ++-
 doc/advanced_setup.rst                         | 10 +++++---
 doc/sphinxext/numpy_ext/docscrape.py           |  5 ++--
 doc/whats_new.rst                              | 33 ++++++++++++--------------
 examples/decoding/plot_decoding_csp_eeg.py     |  2 +-
 examples/decoding/plot_decoding_csp_space.py   |  2 +-
 examples/visualization/plot_clickable_image.py |  2 +-
 examples/visualization/plot_topography.py      |  4 ++--
 mne/__init__.py                                |  2 +-
 mne/connectivity/spectral.py                   |  6 ++---
 mne/cov.py                                     |  3 +--
 mne/decoding/base.py                           | 13 ++++++----
 mne/decoding/csp.py                            |  9 +++++--
 mne/epochs.py                                  | 20 ++++++++++------
 mne/fixes.py                                   | 27 +++++++++++++++++++--
 mne/io/brainvision/brainvision.py              | 16 ++++++-------
 mne/io/meas_info.py                            |  8 ++++++-
 mne/parallel.py                                |  4 ++--
 mne/preprocessing/ica.py                       | 20 +++++++++-------
 mne/realtime/epochs.py                         |  7 ++----
 mne/report.py                                  |  9 +++----
 mne/tests/test_docstring_parameters.py         |  3 ++-
 mne/tests/test_filter.py                       |  4 ++--
 mne/tests/test_report.py                       |  4 ++++
 mne/utils.py                                   | 10 ++++----
 mne/viz/_3d.py                                 |  4 ++--
 mne/viz/topo.py                                |  2 +-
 30 files changed, 161 insertions(+), 99 deletions(-)

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