]> granicus.if.org Git - python/commitdiff
merge 2.7.6 release branch
authorBenjamin Peterson <benjamin@python.org>
Tue, 5 Nov 2013 15:09:52 +0000 (10:09 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 5 Nov 2013 15:09:52 +0000 (10:09 -0500)

Trivial merge