##// 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
/ debian
changelog Loading ...
compat Loading ...
control Loading ...
copyright Loading ...
install Loading ...
ipython.doc-base Loading ...
irunner.1 Loading ...
manpages Loading ...
postinst Loading ...
pycompat Loading ...
rules Loading ...
watch Loading ...