]> granicus.if.org Git - python/commitdiff
Dummy merge from 3.2
authorTim Golden <mail@timgolden.me.uk>
Fri, 29 Jun 2012 17:45:40 +0000 (18:45 +0100)
committerTim Golden <mail@timgolden.me.uk>
Fri, 29 Jun 2012 17:45:40 +0000 (18:45 +0100)

Trivial merge