[med-svn] [python-mne] 03/05: Merge tag 'upstream/0.8.6+dfsg'

[Alexandre Gramfort]

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

agramfort-guest pushed a commit to branch master
in repository python-mne.

commit c88eb593dd58c9fa8b0347f6ffbd2f8e5f07d0c8
Merge: 324a95e 0630aa1
Author: Alexandre Gramfort <alexandre.gramfort at m4x.org>
Date:   Mon Sep 22 16:06:47 2014 -0400

    Merge tag 'upstream/0.8.6+dfsg'
    
    Upstream version 0.8.6+dfsg
    
    Conflicts:
    	mne/__init__.py

 MANIFEST.in                   |  5 +++++
 doc/source/whats_new.rst      |  2 +-
 mne/__init__.py               |  2 +-
 mne/coreg.py                  |  3 ++-
 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 ++
 9 files changed, 41 insertions(+), 3 deletions(-)

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