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

[Paul Wouters]

New commits:
commit 5a22ae94be18d822e0e2439359dd141181347c97
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Apr 1 12:21:04 2016 -0500

    fixup changes

commit 7d7d0ea7b40dd3e1bb01732f5be16876a0304208
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Apr 1 12:14:02 2016 -0500

    IKEv1: use EVENT_SA_REPLACE and not EVENT_NULL
    
    This fixes commit 152d6d95632d hitting an assertion.