-
Committer:
Brian Granger
-
Date:
2009-08-04 17:03:38 UTC
-
mfrom:
(1152.1.49 trunk-lp)
-
Revision ID:
ellisonbg@gmail.com-20090804170338-kzzoe4s5d19f6ebo
Merging -r 1201 from lp:ipython.
This concludes the upstream merge of trunk into the module-reorg branch.