]> granicus.if.org Git - python/commitdiff
merge default
authorArmin Ronacher <armin.ronacher@active-4.com>
Sat, 6 Oct 2012 12:12:21 +0000 (14:12 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sat, 6 Oct 2012 12:12:21 +0000 (14:12 +0200)

Trivial merge