]> granicus.if.org Git - python/commitdiff
merge 3.4 (#13143)
authorBenjamin Peterson <benjamin@python.org>
Mon, 23 Jun 2014 01:00:07 +0000 (18:00 -0700)
committerBenjamin Peterson <benjamin@python.org>
Mon, 23 Jun 2014 01:00:07 +0000 (18:00 -0700)

Trivial merge