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

[Tuomo Soini]

New commits:
commit 2a2578b5763d027c0f5723f4c66844a801f710d4
Author: Tuomo Soini <tis at foobar.fi>
Date:   Thu May 4 21:33:29 2017 +0300

    _updown.netkey,klips: fix use of printf when updating resolv.conf

commit 6f4f66fdd3b1ef593744d97defb6c30b9e560aa7
Author: Tuomo Soini <tis at foobar.fi>
Date:   Thu May 4 21:20:17 2017 +0300

    setup: remove unused variables and cleanup logics