]> granicus.if.org Git - python/commitdiff
Merge 3.4.
authorStefan Krah <skrah@bytereef.org>
Sun, 29 Jun 2014 22:16:09 +0000 (00:16 +0200)
committerStefan Krah <skrah@bytereef.org>
Sun, 29 Jun 2014 22:16:09 +0000 (00:16 +0200)

Trivial merge