##// END OF EJS Templates
Merge branch 'blockbreaker' of git://github.com/fperez/ipython into qtfrontend...
Merge branch 'blockbreaker' of git://github.com/fperez/ipython into qtfrontend Conflicts: IPython/core/blockbreaker.py
epatters -
r2684:6e4f2e29 merge
Show More