]> granicus.if.org Git - python/commitdiff
Merge from 3.4 into default.
authorLarry Hastings <larry@hastings.org>
Mon, 17 Mar 2014 06:01:31 +0000 (23:01 -0700)
committerLarry Hastings <larry@hastings.org>
Mon, 17 Mar 2014 06:01:31 +0000 (23:01 -0700)

Trivial merge