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

[Paul Wouters]

New commits:
commit 2ad979a67da4fdfe597eb78c3293e461440c51d5
Merge: 07bec55 a6a380d
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Feb 10 16:51:13 2013 -0500

    Merge branch 'fragmentation' of vault.libreswan.fi:/srv/src/libreswan into fragmentation
    
    Conflicts:
    	programs/pluto/server.c

commit 07bec55dc7fde0a60ec990471432174235c05ac2
Merge: 298724d 3789f66
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Feb 9 13:53:39 2013 -0500

    Merge branch 'fragmentation' of vault.libreswan.fi:/srv/src/libreswan into fragmentation

commit 298724d671abb2492764c9dcef7372a56e1e478a
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Feb 8 13:35:37 2013 -0500

    * remove dead code in kernel_mast that used to configure mast0
    
    It was triggering a checking script for "ifconfig" usage despite
    it being ifdef'ed out.

commit 90d774516467ed15e74d74161b528110d181ba70
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Feb 7 23:35:23 2013 -0500

    * ike frag: document ISAKMP_FRAG_MAXLEN and ISAKMP_FRAG_FLAGS

commit 251296bba18fd33964246f34782762fc8785e214
Author: Paul Wouters <pwouters at redhat.com>
Date:   Thu Feb 7 23:33:31 2013 -0500

    * ike frag: fixup logging calls and add pointers to online documentation