ipython/ipython — pull request #3194 by minrk (2013-04-17 19:27:55+00:00)
Title: finish up PR #3116

Matthias is on vacation, but there was one last tweak left before merging.

closes #3116