]> granicus.if.org Git - python/commitdiff
merge 2.7.6 release branch
authorBenjamin Peterson <benjamin@python.org>
Mon, 4 Nov 2013 21:35:33 +0000 (16:35 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 4 Nov 2013 21:35:33 +0000 (16:35 -0500)

Trivial merge