]> granicus.if.org Git - python/commitdiff
Merge heads.
authorAlexandre Vassalotti <alexandre@peadrop.com>
Sun, 14 Apr 2013 10:31:40 +0000 (03:31 -0700)
committerAlexandre Vassalotti <alexandre@peadrop.com>
Sun, 14 Apr 2013 10:31:40 +0000 (03:31 -0700)

Trivial merge