##// END OF EJS Templates
Merge branch 'master' into kernelmanager...
Merge branch 'master' into kernelmanager Conflicts: IPython/utils/traitlets.py
Brian Granger -
r2752:5016a14f merge
Show More