]> granicus.if.org Git - python/commitdiff
Merge Ezio's 'merge heads'.
authorR David Murray <rdmurray@bitdance.com>
Sat, 8 Sep 2012 20:43:17 +0000 (16:43 -0400)
committerR David Murray <rdmurray@bitdance.com>
Sat, 8 Sep 2012 20:43:17 +0000 (16:43 -0400)

Trivial merge