]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Sat, 5 Jul 2014 00:17:57 +0000 (17:17 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sat, 5 Jul 2014 00:17:57 +0000 (17:17 -0700)

Trivial merge