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

[Tuomo Soini]

New commits:
commit 28d77ea4c5ea1165ec069a6dd43dc8116a96c242
Author: Tuomo Soini <tis at foobar.fi>
Date:   Mon Dec 26 23:56:04 2016 +0200

    CHANGES: fix encapsulation option name

commit 2f77efdbd01eb05a8ee85207ca3109e5382095fb
Author: Tuomo Soini <tis at foobar.fi>
Date:   Mon Dec 26 23:44:03 2016 +0200

    ipsec.conf: rename encaps encapsulation to follow config option name