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

[D. Hugh Redelmeier]

New commits:
commit 78a9ee43bdb1643e6b49d55dd653d6d1589dc45a
Merge: c48cab1 b5f76e5
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Thu Apr 17 00:00:22 2014 -0400

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

commit c48cab195881cdee12516821fcb76f1206aebdbe
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Wed Apr 16 23:58:22 2014 -0400

    Remove/replace references to the no-longer-implemented --force_keepalive option.
    (Leave its entry to point to the replacement.)

commit 4969e65307e2ee1c8f1bfced5fe70b658f434fd3
Author: D. Hugh Redelmeier <hugh at mimosa.com>
Date:   Wed Apr 16 17:06:21 2014 -0400

    spelling fixes for ipsec.conf(5)