summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-03-05 14:13:50 (GMT)
committerGeorg Brandl <georg@python.org>2011-03-05 14:13:50 (GMT)
commitae2af38f3d605c1e347ad4d1fd7e8bcb43435531 (patch)
treed4f9834162147eff8e88101ce75d6a19ca47a724
parentb5c93e9cadb4311ec3a267d18979d7a5e59d8422 (diff)
parent4db2c257d604b9f39d7431de9593d974a671aeb5 (diff)
downloadcpython-ae2af38f3d605c1e347ad4d1fd7e8bcb43435531.zip
cpython-ae2af38f3d605c1e347ad4d1fd7e8bcb43435531.tar.gz
cpython-ae2af38f3d605c1e347ad4d1fd7e8bcb43435531.tar.bz2
Dummy-merge 2.5 branch into 2.6 branch.
0 files changed, 0 insertions, 0 deletions