]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Tue, 17 Jun 2014 06:49:09 +0000 (23:49 -0700)
committerBenjamin Peterson <benjamin@python.org>
Tue, 17 Jun 2014 06:49:09 +0000 (23:49 -0700)

Trivial merge