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)
commite6adc5d48712cfc51f46bf17bf3fe1620238f415
tree6d62a614e5083f018254be809be6b40018c88721
parent42c562c27a623ff1e624dc1a939ae39cd5d369e7
parentf201d86debb12731b634625a0278e289e3e05e10
Merge branch 'nm-1.2'

Provides fixes and changes for compatibility with current NM releases.

Closes strongswan/strongswan#15.
Fixes #797.