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

[Paul Wouters]

New commits:
commit bc7d88e1840ae87660ef70fa091415aba9ed6df0
Merge: bdc4b8c ad67c45
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Dec 15 18:48:22 2013 -0500

    Merge branch 'master' of vault.libreswan.org:/srv/src/libreswan

commit bdc4b8ccd0b2d1d9b21d74aea2c7a36ac94dec17
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Dec 15 18:46:23 2013 -0500

    ike2: Add IANA entries for ikev2_auth_names and make names consistent