[Python-Dev] [Python-checkins] cpython (2.7): (Merge 3.1) Issue #12012: ssl.PROTOCOL_SSLv2 becomes optional

[Victor Stinner]

Le mercredi 11 mai 2011 à 19:05 +0200, Éric Araujo a écrit :
> Le 10/05/2011 01:52, victor.stinner a écrit :
> > http://hg.python.org/cpython/rev/3c87a13980be
> > changeset:   70001:3c87a13980be
> > branch:      2.7
> > parent:      69996:c9f07c69b138
> > user:        Victor Stinner <victor.stinner at haypocalc.com>
> > date:        Tue May 10 01:52:03 2011 +0200
> > summary:
> >   (Merge 3.1) Issue #12012: ssl.PROTOCOL_SSLv2 becomes optional
> 
>  “(Merge 3.1)” is inaccurate for 2.7.

Ah, why? I did not use "hg merge" command (but hg export|hg import), but
it's a "merge" between two branches. Which term would you use?

Victor