ndawe/scikit-learn — pull request #17 by glouppe (2012-12-21 09:44:59+00:00)
Title: Fix conflicts with master

Recent merges in master broke the PR, again... This fixes it.