]> granicus.if.org Git - python/commitdiff
Merge from 3.4
authorNick Coghlan <ncoghlan@gmail.com>
Sun, 25 May 2014 15:00:34 +0000 (01:00 +1000)
committerNick Coghlan <ncoghlan@gmail.com>
Sun, 25 May 2014 15:00:34 +0000 (01:00 +1000)

Trivial merge