]> granicus.if.org Git - python/commitdiff
merge 2.7.4 release branch
authorBenjamin Peterson <benjamin@python.org>
Sat, 23 Mar 2013 20:23:19 +0000 (15:23 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sat, 23 Mar 2013 20:23:19 +0000 (15:23 -0500)

Trivial merge