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

[Paul Wouters]

New commits:
commit 7314ede40145b3bfb6f4c51c096099ea3931bf2f
Merge: 5df2325 0e297c8
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Feb 27 20:49:03 2014 -0500

    Merge branch 'master' of vault.libreswan.org:/srv/src/libreswan
    
    Conflicts:
    	programs/pluto/ipsec_doi.c

commit 5df232583fcdeda4ca96a005b60a769d54e9d24e
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Feb 24 01:59:32 2014 -0500

    Remove last checks for and define of NAT_T_WITH_PORT_FLOATING