]> granicus.if.org Git - python/commitdiff
Merge 3.3.
authorStefan Krah <skrah@bytereef.org>
Sun, 30 Sep 2012 07:25:34 +0000 (09:25 +0200)
committerStefan Krah <skrah@bytereef.org>
Sun, 30 Sep 2012 07:25:34 +0000 (09:25 +0200)

Trivial merge