]> granicus.if.org Git - python/commitdiff
Issue #21569: merge from 3.4
authorNick Coghlan <ncoghlan@gmail.com>
Mon, 9 Jun 2014 03:30:33 +0000 (13:30 +1000)
committerNick Coghlan <ncoghlan@gmail.com>
Mon, 9 Jun 2014 03:30:33 +0000 (13:30 +1000)

Trivial merge