##// 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 / external
Itpl.py Loading ...
__init__.py Loading ...
argparse.py Loading ...
configobj.py Loading ...
guid.py Loading ...
mglob.py Loading ...
path.py Loading ...
pretty.py Loading ...
simplegeneric.py Loading ...
validate.py Loading ...