]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 15 May 2012 17:11:33 +0000 (10:11 -0700)
committerBenjamin Peterson <benjamin@python.org>
Tue, 15 May 2012 17:11:33 +0000 (10:11 -0700)
commitf4ec88e45aff7db22f1a4783092edd9c604cf793
tree63cf5c2fda1cd23d8227aacca21b0ccfd66b62ef
parent77fa9379e2fd9c074b4c002c0fd5d43caca80fff
parent39bf90d31955055929e475085f20ea88ca3d3daf
merge heads