From: Martin Willi <martin@revosec.ch>
Date: Mon, 18 Mar 2013 09:11:46 +0000 (+0100)
Subject: Merge branch 'stroke-timeout'
X-Git-Tag: 5.0.3rc1~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e85c0f6b846729b061dbfa673eeae0e43e4a7dbb;p=thirdparty%2Fstrongswan.git

Merge branch 'stroke-timeout'

Add a strongswan.conf timeout option for stroke control commands.
---

e85c0f6b846729b061dbfa673eeae0e43e4a7dbb