##// 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.

File last commit:

r1178:e29512cb
r1890:c3323314 merge
Show More
install
1 line | 42 B | text/plain | TextLexer
doc/ipython.el usr/share/emacs/site-lisp