]> granicus.if.org Git - python/commitdiff
Merge commit, because Mercurial's handling of push races is bloody awful
authorNick Coghlan <ncoghlan@gmail.com>
Sun, 30 Sep 2012 07:55:23 +0000 (13:25 +0530)
committerNick Coghlan <ncoghlan@gmail.com>
Sun, 30 Sep 2012 07:55:23 +0000 (13:25 +0530)

Trivial merge