]> granicus.if.org Git - python/commitdiff
merge
authorGeorg Brandl <georg@python.org>
Tue, 14 Jan 2014 11:27:44 +0000 (12:27 +0100)
committerGeorg Brandl <georg@python.org>
Tue, 14 Jan 2014 11:27:44 +0000 (12:27 +0100)

Trivial merge