]> granicus.if.org Git - python/commitdiff
Merge 3.3.
authorStefan Krah <skrah@bytereef.org>
Wed, 29 May 2013 19:12:46 +0000 (21:12 +0200)
committerStefan Krah <skrah@bytereef.org>
Wed, 29 May 2013 19:12:46 +0000 (21:12 +0200)

Trivial merge