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

Trivial merge