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)
Makes charon-systemd and charon-svc also load settings from the charon
section in strongswan.conf.

Fixes #1300.


Trivial merge