]> granicus.if.org Git - python/commitdiff
Merge issue #22711 from 3.4
authorNick Coghlan <ncoghlan@gmail.com>
Sat, 25 Oct 2014 14:02:50 +0000 (00:02 +1000)
committerNick Coghlan <ncoghlan@gmail.com>
Sat, 25 Oct 2014 14:02:50 +0000 (00:02 +1000)

Trivial merge