]> granicus.if.org Git - python/commitdiff
Merge from 3.2
authorNick Coghlan <ncoghlan@gmail.com>
Thu, 7 Jun 2012 12:42:29 +0000 (22:42 +1000)
committerNick Coghlan <ncoghlan@gmail.com>
Thu, 7 Jun 2012 12:42:29 +0000 (22:42 +1000)

Trivial merge