##// END OF EJS Templates
Merging -r 1181 from lp:ipython....
Merging -r 1181 from lp:ipython. A few changes were made to resolve conflicts: * clipboard.py moved to core. * Imports fixed.
Brian Granger -
r2128:edd2e623 merge
Show More