Merge branch 'charon-conf-fallback'
authorTobias Brunner <tobias@strongswan.org>
Tue, 8 Mar 2016 09:56:27 +0000 (10:56 +0100)
committerTobias Brunner <tobias@strongswan.org>
Tue, 8 Mar 2016 09:56:27 +0000 (10:56 +0100)
commit819da83fccf99acf7af1ed2bf61a498425c375e1
tree1d9c5c2c390aa9672a232519f4e5ae564d77dcb9
parent101abed566099b5b9ac53a86a88e03af27bbf1d5
parent2e190dca041a02877b9d639b92c00344c01c0743
Merge branch 'charon-conf-fallback'

Makes charon-systemd and charon-svc also load settings from the charon
section in strongswan.conf.

Fixes #1300.