]> granicus.if.org Git - python/commitdiff
Dummy merge from 3.2
authorNick Coghlan <ncoghlan@gmail.com>
Fri, 19 Oct 2012 13:40:21 +0000 (23:40 +1000)
committerNick Coghlan <ncoghlan@gmail.com>
Fri, 19 Oct 2012 13:40:21 +0000 (23:40 +1000)

Trivial merge