]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Wed, 16 Apr 2014 20:17:16 +0000 (16:17 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 16 Apr 2014 20:17:16 +0000 (16:17 -0400)

Trivial merge