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

r1850:d536fe7e
r1890:c3323314 merge
Show More
index.txt
12 lines | 163 B | text/plain | TextLexer
.. _api-index:
###################
The IPython API
###################
.. htmlonly::
:Release: |version|
:Date: |today|
.. include:: generated/gen.txt