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

Trivial merge