]> granicus.if.org Git - python/commitdiff
Merge 3.4 into default.
authorEric Snow <ericsnowcurrently@gmail.com>
Sat, 29 Mar 2014 00:26:46 +0000 (18:26 -0600)
committerEric Snow <ericsnowcurrently@gmail.com>
Sat, 29 Mar 2014 00:26:46 +0000 (18:26 -0600)

Trivial merge