[med-svn] [python-mne] 325/353: Merge pull request #75 from bburan/joblib_import

[Yaroslav Halchenko]

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

yoh pushed a commit to tag 0.4
in repository python-mne.

commit c91b329ba6acdcd976effd3e642492b917530906
Merge: fa39acb bda8a2d
Author: Alexandre Gramfort <alexandre.gramfort at inria.fr>
Date:   Sun Jul 29 23:49:18 2012 -0700

    Merge pull request #75 from bburan/joblib_import
    
    Import joblib directly if sklearn not installed

 mne/parallel.py | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

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