]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Thu, 15 Dec 2011 20:44:16 +0000 (15:44 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 15 Dec 2011 20:44:16 +0000 (15:44 -0500)
commit57c9c7b755671b7d212ead8988c34d9cf0b11fb3
tree0ea960c7c3fc21feb156415ba5ab37fa35d43872
parentb3132bd9a5485d73baa662eaf8bede06b433e342
parent9c49036e70c19921da39ca3da8124e82d0a395d4
merge heads