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

[Paul Wouters]

New commits:
commit 0616966f66c8f468187b1a530e1ef2cb19afa739
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Aug 18 10:07:00 2014 -0400

    update changes

commit b1b9af2e75da700fe625c3413fba78be4f6864f1
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Aug 18 10:05:10 2014 -0400

    IKEv1: cap IKE lifetimes > OAKLEY_ISAKMP_SA_LIFETIME_MAXIMUM instead of rejecting
    
    Instead, we log a warning and cap it to OAKLEY_ISAKMP_SA_LIFETIME_MAXIMUM