]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 9 Oct 2012 15:16:26 +0000 (11:16 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 9 Oct 2012 15:16:26 +0000 (11:16 -0400)
commit455fa0a314b7f7edd0c8554b12a65267ff1e2e5b
treea4db0395d8674c1e3c4119f0edccf72307b34e49
parentb29614e047110f4d9af993a6cdec4e3fb7ef9738
parent831893a68ec7114c1fc9c8e36b9159f5c1db50c7
merge heads