]> granicus.if.org Git - python/commitdiff
Merge from 3.3.
authorStefan Krah <skrah@bytereef.org>
Thu, 16 Jan 2014 13:43:22 +0000 (14:43 +0100)
committerStefan Krah <skrah@bytereef.org>
Thu, 16 Jan 2014 13:43:22 +0000 (14:43 +0100)

Trivial merge