]> granicus.if.org Git - python/commitdiff
Merge heads.
authorR David Murray <rdmurray@bitdance.com>
Sat, 10 Aug 2013 16:08:41 +0000 (12:08 -0400)
committerR David Murray <rdmurray@bitdance.com>
Sat, 10 Aug 2013 16:08:41 +0000 (12:08 -0400)

Trivial merge