]> granicus.if.org Git - python/commitdiff
Merge.
authorRichard Oudkerk <shibturn@gmail.com>
Thu, 17 Oct 2013 13:31:51 +0000 (14:31 +0100)
committerRichard Oudkerk <shibturn@gmail.com>
Thu, 17 Oct 2013 13:31:51 +0000 (14:31 +0100)

Trivial merge