]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sun, 29 Sep 2013 18:56:10 +0000 (14:56 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sun, 29 Sep 2013 18:56:10 +0000 (14:56 -0400)
commitf63d55800770547d4dfff86797de8572fe609f4e
tree4dedfb3d3435524551a02f0cb6de873c0da7af3d
parent860aee75b83f8d026999682b7565e271c05433a4
parenta5ec63b5ebb1678558e4411d1dda8f994145fde8
merge heads