]> granicus.if.org Git - python/commitdiff
Merge
authorRichard Oudkerk <shibturn@gmail.com>
Tue, 15 Jan 2013 13:22:34 +0000 (13:22 +0000)
committerRichard Oudkerk <shibturn@gmail.com>
Tue, 15 Jan 2013 13:22:34 +0000 (13:22 +0000)

Trivial merge