]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 13 Mar 2012 21:13:21 +0000 (16:13 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 13 Mar 2012 21:13:21 +0000 (16:13 -0500)
commit47930016ff2bf57134d4976ae75b00b8e2dad01d
tree075677409afd5316aa977ecb6e654c26e2cc6aec
parent2354a7593f0e006c60d2080dca40579461549cb9
parent7ca97d5208e37690f43045d5f89098f42d88fd0f
merge heads