ipython/ipython — pull request #6875 by takluyver (2014-11-06 23:57:55+00:00)
Title: Combofix

I haven't really reviewed this, but hopefully this will get the tests passing.