]> granicus.if.org Git - python/commitdiff
Merge heads.
authorGeorg Brandl <georg@python.org>
Wed, 30 May 2012 20:04:57 +0000 (22:04 +0200)
committerGeorg Brandl <georg@python.org>
Wed, 30 May 2012 20:04:57 +0000 (22:04 +0200)

Trivial merge