]> granicus.if.org Git - python/commitdiff
Merge heads
authorMark Dickinson <dickinsm@gmail.com>
Mon, 29 Aug 2016 18:27:43 +0000 (19:27 +0100)
committerMark Dickinson <dickinsm@gmail.com>
Mon, 29 Aug 2016 18:27:43 +0000 (19:27 +0100)

Trivial merge