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

[Paul Wouters]

New commits:
commit 418da26c1f5ffdd13cf3ea523bf7a69f295f6a17
Merge: 29999c3 896ff57
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Mar 5 14:19:13 2013 -0500

    Merge branch 'master' of vault.foobar.fi:/srv/src/libreswan

commit 29999c34453352a80feaad787fd8b2961998cd52
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Mar 5 14:17:27 2013 -0500

    * fixup recently introduced check for rekey=no plus dpdaction=restart
    
    commit 4dde1771e5e89cd80 to implement this never triggered because it
    confused conn->options_set[X] and conn->options[X]