]> granicus.if.org Git - python/commitdiff
merge 3.4 (#21089)
authorBenjamin Peterson <benjamin@python.org>
Fri, 28 Mar 2014 22:55:04 +0000 (18:55 -0400)
committerBenjamin Peterson <benjamin@python.org>
Fri, 28 Mar 2014 22:55:04 +0000 (18:55 -0400)

Trivial merge