]> granicus.if.org Git - python/commitdiff
merge heads
authorSandro Tosi <sandro.tosi@gmail.com>
Fri, 19 Aug 2011 16:43:43 +0000 (18:43 +0200)
committerSandro Tosi <sandro.tosi@gmail.com>
Fri, 19 Aug 2011 16:43:43 +0000 (18:43 +0200)

Trivial merge