]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Fri, 24 Feb 2012 16:49:07 +0000 (11:49 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 24 Feb 2012 16:49:07 +0000 (11:49 -0500)
commitc6fbf47b28173c7bbac9a9e19201876d945859d3
tree8bfa5742c45c72766c61f80c875abd6c34652902
parent6eaaeff00e43fe86ea2b832fdb9bf497eab742f7
parent625cd23da4e760311bd81d8f3f7edba809e981d8
merge heads