]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Fri, 12 Dec 2014 14:56:54 +0000 (09:56 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 12 Dec 2014 14:56:54 +0000 (09:56 -0500)

Trivial merge