ipython/ipython — pull request #4900 by baoboa (2014-01-28 13:45:54+00:00)
Title: Merge pull request #1 from ipython/master

merge with upstream