Merge branch 'nm-1.2'
authorTobias Brunner <tobias@strongswan.org>
Mon, 5 Sep 2016 13:41:51 +0000 (15:41 +0200)
committerTobias Brunner <tobias@strongswan.org>
Mon, 5 Sep 2016 13:41:51 +0000 (15:41 +0200)
Provides fixes and changes for compatibility with current NM releases.

Closes strongswan/strongswan#15.
Fixes #797.


Trivial merge