]> granicus.if.org Git - python/commitdiff
Merge
authorMichael Foord <michael@voidspace.org.uk>
Sun, 25 Mar 2012 17:16:26 +0000 (18:16 +0100)
committerMichael Foord <michael@voidspace.org.uk>
Sun, 25 Mar 2012 17:16:26 +0000 (18:16 +0100)

Trivial merge