##// END OF EJS Templates
Merge branch 'windows-workdir' of http://github.com/darrendale/ipython into darrendale-windows-workdir
Merge branch 'windows-workdir' of http://github.com/darrendale/ipython into darrendale-windows-workdir
Fernando Perez -
r3231:fd953900 merge
Show More