[Python-checkins] cpython (merge default -> 3.3): merge 3.3 (#18470)

[Victor Stinner]

2013/7/16 benjamin.peterson <python-checkins at python.org>:
> http://hg.python.org/cpython/rev/8889c9b5dd3a
> changeset:   84654:8889c9b5dd3a
> branch:      3.3
> parent:      84653:c3a510b22218
> parent:      84652:8a078bf3cf14
> user:        Benjamin Peterson <benjamin at python.org>
> date:        Mon Jul 15 19:15:49 2013 -0700
> summary:
>   merge 3.3 (#18470)

This commit merges branches default and 3.3 into 3.3. Usually, we
merge branches 3.3 and default into default.

Because of this changeset, when I try to merge 3.3 into default, I get
a long list of modifications...

Victor