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

Trivial merge