]> granicus.if.org Git - python/commitdiff
Merge from 3.4
authorAndrew Kuchling <amk@amk.ca>
Wed, 16 Apr 2014 01:21:56 +0000 (21:21 -0400)
committerAndrew Kuchling <amk@amk.ca>
Wed, 16 Apr 2014 01:21:56 +0000 (21:21 -0400)

Trivial merge