]> granicus.if.org Git - python/commitdiff
merge
authorGeorg Brandl <georg@python.org>
Sun, 9 Mar 2014 09:23:24 +0000 (10:23 +0100)
committerGeorg Brandl <georg@python.org>
Sun, 9 Mar 2014 09:23:24 +0000 (10:23 +0100)

Trivial merge