[Python-checkins] cpython (merge 3.3 -> default): Merge.

[charles-francois.natali]

http://hg.python.org/cpython/rev/48218c3ea952
changeset:   87985:48218c3ea952
parent:      87984:0943778ee188
parent:      87983:e696c1057c98
user:        Charles-François Natali <cf.natali at gmail.com>
date:        Mon Dec 16 13:49:38 2013 +0100
summary:
  Merge.

files:



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