]> granicus.if.org Git - python/commitdiff
Merge
authorMichael Foord <michael@voidspace.org.uk>
Mon, 14 Apr 2014 15:26:38 +0000 (11:26 -0400)
committerMichael Foord <michael@voidspace.org.uk>
Mon, 14 Apr 2014 15:26:38 +0000 (11:26 -0400)

Trivial merge