]> granicus.if.org Git - python/commitdiff
merge 2.7.9 release branch
authorBenjamin Peterson <benjamin@python.org>
Tue, 2 Dec 2014 23:45:45 +0000 (18:45 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 2 Dec 2014 23:45:45 +0000 (18:45 -0500)

Trivial merge