]> granicus.if.org Git - python/commitdiff
Merge from 3.4.
authorBerker Peksag <berker.peksag@gmail.com>
Fri, 4 Jul 2014 12:07:31 +0000 (15:07 +0300)
committerBerker Peksag <berker.peksag@gmail.com>
Fri, 4 Jul 2014 12:07:31 +0000 (15:07 +0300)

Trivial merge