]> granicus.if.org Git - python/commitdiff
Merge heads.
authorAlexandre Vassalotti <alexandre@peadrop.com>
Sun, 1 Dec 2013 00:56:36 +0000 (16:56 -0800)
committerAlexandre Vassalotti <alexandre@peadrop.com>
Sun, 1 Dec 2013 00:56:36 +0000 (16:56 -0800)

Trivial merge