]> granicus.if.org Git - python/commitdiff
merge heads
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>
Fri, 13 Apr 2012 00:32:51 +0000 (02:32 +0200)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>
Fri, 13 Apr 2012 00:32:51 +0000 (02:32 +0200)

Trivial merge