]> granicus.if.org Git - python/commitdiff
Merge from 3.3.
authorStefan Krah <skrah@bytereef.org>
Sun, 15 Dec 2013 19:52:08 +0000 (20:52 +0100)
committerStefan Krah <skrah@bytereef.org>
Sun, 15 Dec 2013 19:52:08 +0000 (20:52 +0100)

Trivial merge