Brian Granger e10677aaff Merging upstream changes from inputhook branch. ... These changes are being propagated from trunk->module-reorg->inputhook to me.		2009-08-04 12:29:37 -07:00
IPython/testing	Merging upstream change from module-reorg branch.	2009-08-04 11:19:33 -07:00
setup.py	Merging -r 1180 from lp:ipthon	2009-08-03 13:04:27 -07:00
setupbase.py	Merging -r 1192 from lp:ipython.	2009-08-04 08:22:09 -07:00