##// END OF EJS Templates
Merge branch 'issue-31'...
Merge branch 'issue-31' Conflicts: IPython/core/magic.py closes gh-31
Thomas Kluyver -
r3460:11e30b27 merge
Show More