]> granicus.if.org Git - python/commitdiff
Merge heads
authorAntoine Pitrou <solipsis@pitrou.net>
Sun, 2 Nov 2014 17:42:41 +0000 (18:42 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Sun, 2 Nov 2014 17:42:41 +0000 (18:42 +0100)

Trivial merge