]> granicus.if.org Git - python/commitdiff
Merge from 3.3
authorNick Coghlan <ncoghlan@gmail.com>
Fri, 19 Oct 2012 13:37:28 +0000 (23:37 +1000)
committerNick Coghlan <ncoghlan@gmail.com>
Fri, 19 Oct 2012 13:37:28 +0000 (23:37 +1000)

Trivial merge