]> granicus.if.org Git - python/commitdiff
merge 2.7.9 release branch
authorBenjamin Peterson <benjamin@python.org>
Sun, 30 Nov 2014 04:06:22 +0000 (23:06 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 30 Nov 2014 04:06:22 +0000 (23:06 -0500)

Trivial merge