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

[Paul Wouters]

New commits:
commit db261b2d758c5cba71bf9a8360b3c00363ea5009
Merge: f52e65c 8c3ee75
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Jan 9 22:14:33 2014 -0500

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

commit f52e65c3201eff43df7aa3649c17bae3ca871b68
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Jan 9 11:46:28 2014 -0500

    Removed stub interop-ikev2-strongswan-08-nat-1

commit 2e057b0f5800e8968966b91df862c35e84811983
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Jan 9 11:31:01 2014 -0500

    In send_notification* use notification_t instead of u_int16_t

commit 91dfca0d34ac6e25f556700623bb0e63d08bc4fc
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Jan 9 11:24:39 2014 -0500

    Change variable name from state to from_state in send_notification_from_state()

commit e9abc182a2ad1579e103687c6b28dd0142024d32
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Jan 9 11:21:17 2014 -0500

    slightly change an error message to be more correct regarding IV