]> granicus.if.org Git - python/commitdiff
Merge with 3.2
authorKristján Valur Jónsson <kristjan@ccpgames.com>
Fri, 23 Mar 2012 12:52:11 +0000 (12:52 +0000)
committerKristján Valur Jónsson <kristjan@ccpgames.com>
Fri, 23 Mar 2012 12:52:11 +0000 (12:52 +0000)

Trivial merge