]> granicus.if.org Git - python/commitdiff
merge with 3.3
authorFrank Wierzbicki <fwierzbicki@gmail.com>
Wed, 16 Jan 2013 22:10:36 +0000 (14:10 -0800)
committerFrank Wierzbicki <fwierzbicki@gmail.com>
Wed, 16 Jan 2013 22:10:36 +0000 (14:10 -0800)

Trivial merge