Merge remote branch 'alioth/master'

* alioth/master:
  BF: oops -- I should have listed binary package for python-scikits-learn
  adding scikit-learn into neurodebian.cfg so we could have it presented for all distros

diff --git a/neurodebian.cfg b/neurodebian.cfg
index cbdd9b55b81a5b7ec0760ceee4cd6573976f26ba..2c90574bb605e5ef105f4e058fc99201c5d66932 100644 (file)
--- a/neurodebian.cfg
+++ b/neurodebian.cfg
@@ -14,6 +14,7 @@ select taskfiles =
 select names = fsl-doc fslview-doc fsl-atlases fsl-possum-data fsl-first-data
  fsl-feeds libnifti1 odin mitools afni-atlases python-pyssdh python-networkx
  r-cran-glmnet python-rpy2 python-mvpa-snapshot python-nibabel-snapshot
+ python-scikits-learn
 
 # Information about prospective packages to be imported from taskfiles
 prospective =