]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Fri, 6 Apr 2012 17:20:25 +0000 (13:20 -0400)
committerBenjamin Peterson <benjamin@python.org>
Fri, 6 Apr 2012 17:20:25 +0000 (13:20 -0400)
commit049208635d4bb55f757de7f599f73902748c8257
treebf7cf4462061474ec00a8f5c9305514ed3fba383
parent161aece9d3574c22d2585687db5cd4f33a76f052
parentd62cd5627fc5c01571c018b8a11b152614862eff
merge heads