]> granicus.if.org Git - python/commitdiff
Merge
authorRichard Oudkerk <shibturn@gmail.com>
Fri, 17 Aug 2012 14:05:09 +0000 (15:05 +0100)
committerRichard Oudkerk <shibturn@gmail.com>
Fri, 17 Aug 2012 14:05:09 +0000 (15:05 +0100)

Trivial merge