]> granicus.if.org Git - python/commitdiff
Merge from 3.4
authorTim Golden <mail@timgolden.me.uk>
Wed, 8 Apr 2015 15:53:21 +0000 (16:53 +0100)
committerTim Golden <mail@timgolden.me.uk>
Wed, 8 Apr 2015 15:53:21 +0000 (16:53 +0100)

Trivial merge