commit | ae2af38f3d605c1e347ad4d1fd7e8bcb43435531 | [log] [tgz] |
---|---|---|
author | Georg Brandl <georg@python.org> | Sat Mar 05 15:13:50 2011 +0100 |
committer | Georg Brandl <georg@python.org> | Sat Mar 05 15:13:50 2011 +0100 |
tree | d4f9834162147eff8e88101ce75d6a19ca47a724 | |
parent | b5c93e9cadb4311ec3a267d18979d7a5e59d8422 [diff] | |
parent | 4db2c257d604b9f39d7431de9593d974a671aeb5 [diff] |
Dummy-merge 2.5 branch into 2.6 branch.