]> granicus.if.org Git - python/commitdiff
Merge from 3.4
authorAndrew Kuchling <amk@amk.ca>
Mon, 8 Jun 2015 22:19:51 +0000 (18:19 -0400)
committerAndrew Kuchling <amk@amk.ca>
Mon, 8 Jun 2015 22:19:51 +0000 (18:19 -0400)

Trivial merge