]> granicus.if.org Git - python/commitdiff
Merge with 3.3
authorKristján Valur Jónsson <sweskman@gmail.com>
Wed, 20 Mar 2013 03:26:39 +0000 (20:26 -0700)
committerKristján Valur Jónsson <sweskman@gmail.com>
Wed, 20 Mar 2013 03:26:39 +0000 (20:26 -0700)

Trivial merge