[med-svn] [python-mne] 05/06: Merge remote-tracking branch 'origin/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 1bf5ea24231b327456461c2f88bf84167b6ef164
Merge: e9721ee b5a317d
Author: Yaroslav Halchenko <debian at onerussian.com>
Date:   Thu Nov 26 10:01:13 2015 -0500

    Merge remote-tracking branch 'origin/debian'
    
    * origin/debian:
      Patched a decorator for a test that uses mayavi.
      Imported Upstream version 0.10.1+dfsg
      Imported Upstream version 0.10.1+dfsg

 debian/patches/fix_test | 22 ++++++++++++++++++++++
 debian/patches/series   |  1 +
 2 files changed, 23 insertions(+)

diff --cc debian/patches/series
index b4c3311,f005122..cb46848
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,3 +1,3 @@@
  changeset_9c7ef6d10f1f767b742525ea31e42a65a0469327.diff
 -paths
 +deb_paths
+ fix_test

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