]> granicus.if.org Git - python/commitdiff
merge
authorGiampaolo Rodola' <g.rodola@gmail.com>
Fri, 23 Mar 2012 12:29:49 +0000 (13:29 +0100)
committerGiampaolo Rodola' <g.rodola@gmail.com>
Fri, 23 Mar 2012 12:29:49 +0000 (13:29 +0100)

Trivial merge