]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Fri, 8 Jul 2011 18:39:56 +0000 (13:39 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 8 Jul 2011 18:39:56 +0000 (13:39 -0500)
commit910789f10fb314fe7149be84aa57d6ec12ad4a7b
treea658027493df6d758e5d0b802ffa72e66594ad1e
parentae10c0653e5469e7f41f12cee35bfe653a389cbc
parent4a183b47f353a25b76aaaf1b7043458dbcab8890
merge heads