]> granicus.if.org Git - python/commitdiff
merge 2.7.7 release branch
authorBenjamin Peterson <benjamin@python.org>
Sun, 18 May 2014 23:33:28 +0000 (16:33 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sun, 18 May 2014 23:33:28 +0000 (16:33 -0700)

Trivial merge