]> granicus.if.org Git - python/commitdiff
merge 3.4 (#16561)
authorBenjamin Peterson <benjamin@python.org>
Fri, 28 Nov 2014 02:41:36 +0000 (20:41 -0600)
committerBenjamin Peterson <benjamin@python.org>
Fri, 28 Nov 2014 02:41:36 +0000 (20:41 -0600)

Trivial merge