Merge branch 'stroke-timeout'
authorMartin Willi <martin@revosec.ch>
Mon, 18 Mar 2013 09:11:46 +0000 (10:11 +0100)
committerMartin Willi <martin@revosec.ch>
Mon, 18 Mar 2013 09:11:46 +0000 (10:11 +0100)
commite85c0f6b846729b061dbfa673eeae0e43e4a7dbb
tree17ae9c25cfd1c4fd0f954837ff406cafe1be6924
parentcb14ecb1d3345ae183a364ca903cf2b28ce48a23
parent83e2c81924a622e9c009861ffde2c249156855ec
Merge branch 'stroke-timeout'

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