]> granicus.if.org Git - python/commitdiff
merge 2.7.6 branch
authorBenjamin Peterson <benjamin@python.org>
Tue, 29 Oct 2013 22:18:52 +0000 (18:18 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 29 Oct 2013 22:18:52 +0000 (18:18 -0400)

Trivial merge