]> granicus.if.org Git - python/commitdiff
merge heads
authorGeorg Brandl <georg@python.org>
Thu, 23 Feb 2012 20:16:49 +0000 (21:16 +0100)
committerGeorg Brandl <georg@python.org>
Thu, 23 Feb 2012 20:16:49 +0000 (21:16 +0100)

Trivial merge