]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 25 Jan 2012 21:43:54 +0000 (16:43 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 25 Jan 2012 21:43:54 +0000 (16:43 -0500)
commit0a15103d793141e22489a3de612f44f6dbb63d29
treea54bc147839a270312c9fa7a9ecf7c38a42f25ba
parentdcd37e81542418546255cdd451d0e5326d7dba35
parente9401a0476d7e3e0e7dd89c54190c7f774ca49c1
merge heads