]> granicus.if.org Git - python/commitdiff
Merge 2.7.9 release branch
authorBenjamin Peterson <benjamin@python.org>
Sun, 7 Dec 2014 19:25:59 +0000 (14:25 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 7 Dec 2014 19:25:59 +0000 (14:25 -0500)

Trivial merge