[Swan-commit] Changes to ref refs/heads/master

[Paul Wouters]

New commits:
commit a07cb292f53628608cb850058ac98b86c4e4f069
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Oct 29 17:56:55 2013 -0400

    pluto: disentange ikev2 proposal from ikev2 next payload type
    
    Don't re-use IKEv1 values. Introduced ikev2_last_proposal_names
    to distinguish these from ikev1 next_payload_type