]> granicus.if.org Git - python/commitdiff
Merge.
authorStefan Krah <skrah@bytereef.org>
Fri, 28 Sep 2012 14:21:17 +0000 (16:21 +0200)
committerStefan Krah <skrah@bytereef.org>
Fri, 28 Sep 2012 14:21:17 +0000 (16:21 +0200)

Trivial merge