]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 23 May 2011 21:30:29 +0000 (16:30 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 23 May 2011 21:30:29 +0000 (16:30 -0500)
commitbfcdcf928225f6e34036a0f768c34dcc4814c860
tree9836e4881f93739fc390b1fe40a2f54357b266b1
parent5cc10b00094f06af56dedd02d39bc46886e17c70
parent08c719eb955fd5fb8bb3e39c9c39e5b50b539179
merge heads