]> git.ipfire.org Git - people/ms/strongswan.git/commitdiff
projects / people / ms / strongswan.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 84a3077 1a8a420)
Merge branch 'vici-undo-on-unload'
authorMartin Willi <martin@strongswan.org>
Mon, 7 Dec 2015 09:29:57 +0000 (10:29 +0100)
committerMartin Willi <martin@strongswan.org>
Mon, 7 Dec 2015 09:29:57 +0000 (10:29 +0100)
Undo start actions when unloading connections, and add some misc fixes and
extensions to vici connection handling.


Trivial merge
Michael's strongswan development tree