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

[Paul Wouters]

New commits:
commit 88931c4efd6c06dd6ed59826b227280fb5c3a0a4
Merge: 17c6f28 6581e99
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Oct 11 10:56:19 2013 -0400

    Merge branch 'master' into ikev2-feature

commit 17c6f287158e2333ed829dd734034964a50e7174
Merge: 294ae0f 30bdea6
Author: Matt Rogers <mrogers at redhat.com>
Date:   Thu Sep 26 23:29:16 2013 -0400

    Merge branch 'master' into ikev2-feature
    
    Conflicts:
    	programs/pluto/ikev2.c

commit 294ae0fb0b069e0bf4f241a896f2c287d627fcb0
Author: Matt Rogers <mrogers at redhat.com>
Date:   Thu Sep 26 23:22:41 2013 -0400

    ikev2 - coding style cleanups

commit b6b18ddabf1823fe825e6d9746feac7a8a2827fe
Author: Matt Rogers <mrogers at redhat.com>
Date:   Tue Sep 17 17:09:37 2013 -0400

    ikev2 - remove references to DPD_ACTION_RESTART_BY_PEER

commit 93f62d6073e40377d6ea5242a5657c591f0e45f5
Author: Matt Rogers <mrogers at redhat.com>
Date:   Sat Sep 7 19:03:30 2013 -0400

    testing: ikev2-liveness tests 01-04, tests restart and clear
    actions for liveness enabled on a single peer and both peers

commit 0bc44aa275854bac3ae4050f8b4e21ee0432e2e3
Author: Matt Rogers <mrogers at redhat.com>
Date:   Wed Sep 4 23:59:13 2013 -0400

    ikev2 liveness - Lower the minimum delay time to 1 second as suggested

commit 7e46268db92cf2fe3d0ee7207f633ccd98db08af
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Aug 6 13:27:01 2013 +0200

    some comments and minor debug changes

commit 4d232d86bb0ecae48206f04b41da4d509a8f001f
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Aug 6 12:43:45 2013 +0200

    starterwhack: move the DPD_ACTION_HOLD default action
    
    Set the default at the top, instead of deep down the if/else path.

commit 30c6e3016bff6526aa10b5970a83dc20921f60fc
Author: Matt Rogers <mrogers at redhat.com>
Date:   Thu Aug 1 01:04:43 2013 -0400

    ikev2 - unpend parent sa, rekey fixes

commit 6b08bc772e6b2c593e17738d30a5a7562ff809aa
Author: Matt Rogers <mrogers at redhat.com>
Date:   Thu Aug 1 00:55:08 2013 -0400

    RFC 5996 IKEv2 liveness checking