[med-svn] [python-mne] 01/01: Merge tag 'upstream/0.8.6+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 890e278a049a7e9c9ccfbab7a05ac46e4fc6c323
Merge: a1067ac 94fc362
Author: Yaroslav Halchenko <debian at onerussian.com>
Date:   Wed Oct 29 22:46:18 2014 -0400

    Merge tag 'upstream/0.8.6+dfsg'
    
    tagging imported by Alex upstream/0.8.6+dfsg
    
    * tag 'upstream/0.8.6+dfsg':
      Imported Upstream version 0.8.6+dfsg Conflicts: 	mne/__init__.py
    
    Also manually removed those .min.js files which managed to sneak in

 mne/html/bootstrap.min.js     |  7 -------
 mne/html/d3.v3.min.js         |  5 -----
 mne/html/jquery-1.10.2.min.js |  6 ------
 mne/html/jquery-ui.min.js     | 12 ------------
 mne/html/mpld3.v0.2.min.js    |  2 --
 5 files changed, 32 deletions(-)

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