Merge branch '2365-android-nat-keepalive'
authorTobias Brunner <tobias@strongswan.org>
Mon, 3 Jul 2017 08:33:52 +0000 (10:33 +0200)
committerTobias Brunner <tobias@strongswan.org>
Mon, 3 Jul 2017 08:33:52 +0000 (10:33 +0200)
This makes the NAT-T keepalive interval configurable per connection.

Fixes #2365.


Trivial merge