ipython/ipython — pull request #7164 by jasongrout (2014-12-10 20:43:38+00:00)
Title: fix resolve->return promises error

Ping @jdfreder to review