]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Fri, 5 Dec 2014 20:28:27 +0000 (22:28 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Fri, 5 Dec 2014 20:28:27 +0000 (22:28 +0200)

Trivial merge