##// END OF EJS Templates
Merge branch 'pypy-compat' of https://github.com/takluyver/ipython into takluyver-pypy-compat
Merge branch 'pypy-compat' of https://github.com/takluyver/ipython into takluyver-pypy-compat
Thomas Kluyver -
r3508:38550298 merge
Show More