]> granicus.if.org Git - python/commitdiff
merge heads
authorSandro Tosi <sandro.tosi@gmail.com>
Fri, 1 Jun 2012 18:25:36 +0000 (20:25 +0200)
committerSandro Tosi <sandro.tosi@gmail.com>
Fri, 1 Jun 2012 18:25:36 +0000 (20:25 +0200)

Trivial merge