[Python-checkins] cpython (merge 3.3 -> default): Propagate dummy merge from 3.3

[nick.coghlan]

http://hg.python.org/cpython/rev/6ff9eef4e7c3
changeset:   79847:6ff9eef4e7c3
parent:      79844:2d53f92ed54c
parent:      79846:ee0c0f1c1eb2
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Sat Oct 20 11:45:23 2012 +1000
summary:
  Propagate dummy merge from 3.3

files:



-- 
Repository URL: http://hg.python.org/cpython