robertlayton/scikit-learn — pull request #6 by perimosocordiae (2014-09-11 16:51:26+00:00)
Title: Fix merge conflict with scikit-learn/master

Turns out the conflict wasn't anything significant. Should unblock #2532.