]> granicus.if.org Git - python/commitdiff
Merge from 3.4
authorTal Einat <taleinat@gmail.com>
Tue, 9 Jun 2015 15:42:18 +0000 (18:42 +0300)
committerTal Einat <taleinat@gmail.com>
Tue, 9 Jun 2015 15:42:18 +0000 (18:42 +0300)

Trivial merge