]> granicus.if.org Git - python/commitdiff
Merge 3.3.
authorStefan Krah <skrah@bytereef.org>
Sun, 30 Sep 2012 15:21:49 +0000 (17:21 +0200)
committerStefan Krah <skrah@bytereef.org>
Sun, 30 Sep 2012 15:21:49 +0000 (17:21 +0200)

Trivial merge