]> granicus.if.org Git - python/commitdiff
merge from 3.4
authorSenthil Kumaran <senthil@uthcode.com>
Wed, 11 Jun 2014 13:19:47 +0000 (06:19 -0700)
committerSenthil Kumaran <senthil@uthcode.com>
Wed, 11 Jun 2014 13:19:47 +0000 (06:19 -0700)

Trivial merge