]> granicus.if.org Git - python/commitdiff
merge 3.3
authorMartin v. Loewis <martin@v.loewis.de>
Sun, 24 Mar 2013 21:12:19 +0000 (22:12 +0100)
committerMartin v. Loewis <martin@v.loewis.de>
Sun, 24 Mar 2013 21:12:19 +0000 (22:12 +0100)

Trivial merge