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

Trivial merge