]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Sat, 31 May 2014 20:17:15 +0000 (13:17 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sat, 31 May 2014 20:17:15 +0000 (13:17 -0700)

Trivial merge