]> granicus.if.org Git - python/commitdiff
merge 2.7.9 release branch
authorBenjamin Peterson <benjamin@python.org>
Fri, 28 Nov 2014 02:40:35 +0000 (20:40 -0600)
committerBenjamin Peterson <benjamin@python.org>
Fri, 28 Nov 2014 02:40:35 +0000 (20:40 -0600)

Trivial merge