]> granicus.if.org Git - python/commitdiff
Merge.
authorRichard Oudkerk <shibturn@gmail.com>
Sat, 2 Nov 2013 17:08:01 +0000 (17:08 +0000)
committerRichard Oudkerk <shibturn@gmail.com>
Sat, 2 Nov 2013 17:08:01 +0000 (17:08 +0000)

Trivial merge