]> granicus.if.org Git - python/commitdiff
Merge with 3.2 (Issue #14387)
authorKristján Valur Jónsson <kristjan@ccpgames.com>
Thu, 22 Mar 2012 23:13:48 +0000 (23:13 +0000)
committerKristján Valur Jónsson <kristjan@ccpgames.com>
Thu, 22 Mar 2012 23:13:48 +0000 (23:13 +0000)

Trivial merge