##// END OF EJS Templates
Merging -r 1182 from lp:ipython....
Merging -r 1182 from lp:ipython. Minor conflicts with removal of testing/attic.
Brian Granger -
r2131:8b463073 merge
Show More