##// END OF EJS Templates
Merging latest trunk....
Merging latest trunk. I got a criss-cross merge in this and did merge --weave. Hope this is OK.
Brian Granger -
r1890:c3323314 merge
Show More
Name Size Modified Last Commit Author
/ IPython / kernel / scripts
__init__.py Loading ...
ipcluster Loading ...
ipcluster.py Loading ...
ipcontroller Loading ...
ipcontroller.py Loading ...
ipengine Loading ...
ipengine.py Loading ...