[med-svn] [python-mne] 13/15: Merge tag 'upstream/0.13+git8-gcb8707f+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 46bf5661abed26d58585b0799293aebb8ce9ad50
Merge: 668dc1c 084ae9f
Author: Yaroslav Halchenko <debian at onerussian.com>
Date:   Fri Nov 18 10:38:09 2016 -0500

    Merge tag 'upstream/0.13+git8-gcb8707f+dfsg'
    
    filtered out manualy .min files
    
    * tag 'upstream/0.13+git8-gcb8707f+dfsg':
      manually filtering out .min.js since were not filtered out automagically
      New upstream version 0.13+git8-gcb8707f

 mne/decoding/tests/test_ems.py                     |    2 +-
 mne/externals/tempita/__init__.py                  | 1305 +-------------------
 mne/externals/tempita/_looper.py                   |    4 +-
 mne/externals/tempita/{__init__.py => _tempita.py} |  369 ++----
 mne/externals/tempita/compat3.py                   |   20 +-
 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 -
 setup.cfg                                          |    4 +-
 setup.py                                           |    1 -
 12 files changed, 143 insertions(+), 1594 deletions(-)

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