]> granicus.if.org Git - python/commitdiff
Merge 3.4.
authorRichard Oudkerk <shibturn@gmail.com>
Sun, 23 Mar 2014 18:53:53 +0000 (18:53 +0000)
committerRichard Oudkerk <shibturn@gmail.com>
Sun, 23 Mar 2014 18:53:53 +0000 (18:53 +0000)

Trivial merge