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

[Tuomo Soini]

New commits:
commit c4d22fdf49087aa835a5dc8c0ef1c8fb3b7e26eb
Author: Tuomo Soini <tis at foobar.fi>
Date:   Thu May 12 19:46:36 2016 +0300

    _updown.netkey: add PLUTO_IS_PEER_CISCO and PLUTO_NM_CONFIGURED data

commit d14715d7e8b045751c0b113e6afe0795e15acb6c
Author: Tuomo Soini <tis at foobar.fi>
Date:   Thu May 12 18:54:10 2016 +0300

    _updown.netkey.in: unify used logics and use grep -q when appropriate

commit c39a8066160292afcb5c666ebb15a196fabf5a3b
Author: Tuomo Soini <tis at foobar.fi>
Date:   Thu May 12 18:30:26 2016 +0300

    _updown.netkey: cleanup and unify option handling