]> granicus.if.org Git - python/commitdiff
Merge issue #21569 from 3.4
authorNick Coghlan <ncoghlan@gmail.com>
Sat, 7 Jun 2014 14:00:13 +0000 (00:00 +1000)
committerNick Coghlan <ncoghlan@gmail.com>
Sat, 7 Jun 2014 14:00:13 +0000 (00:00 +1000)

Trivial merge