[med-svn] [python-mne] 02/02: Fix Changelog and merge branch 'master' of ssh://git.debian.org/git/debian-med/python-mne

[Andreas Tille]

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

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

commit be047c02df873577686c00c5bd49b12677825199
Merge: cb82162 1b9fdbe
Author: Andreas Tille <tille at debian.org>
Date:   Sat Aug 2 16:28:21 2014 +0200

    Fix Changelog and merge branch 'master' of ssh://git.debian.org/git/debian-med/python-mne
    
    Conflicts:
    	debian/changelog

 debian/changelog        | 4 ++--
 mne/__init__.py         | 2 +-
 mne/tests/test_utils.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index b8b22e4,0cabe88..e265fb7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,21 +1,9 @@@
- python-mne (0.8.1-1) UNRELEASED; urgency=low
 -python-mne (0.8.2) unstable; urgency=low
++python-mne (0.8.2-1) UNRELEASED; urgency=low
  
    * New upstream version.
  
-  -- Alexandre Gramfort <alexandre.gramfort at m4x.org>  Thu, 31 Jul 2014 23:56:25 -0400
+  -- Alexandre Gramfort <alexandre.gramfort at m4x.org>  Fri, 01 Aug 2014 23:01:26 +0000
  
 -python-mne (0.8.1) unstable; urgency=low
 -
 -  * New upstream version.
 -
 - -- Alexandre Gramfort <alexandre.gramfort at m4x.org>  Thu, 31 Jul 2014 23:56:25 -0400
 -
 -python-mne (0.8) unstable; urgency=low
 -
 -  * New upstream version.
 -
 - -- Alexandre Gramfort <alexandre.gramfort at m4x.org>  Thu, 31 Jul 2014 23:39:54 -0400
 -
  python-mne (0.7.3-1) unstable; urgency=low
  
    * New upstream version

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