]> 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: c7bb1dc 2185c29)
Merge branch 'vici-python'
authorMartin Willi <martin@revosec.ch>
Wed, 18 Mar 2015 14:03:28 +0000 (15:03 +0100)
committerMartin Willi <martin@revosec.ch>
Wed, 18 Mar 2015 14:03:28 +0000 (15:03 +0100)
Introduce a Python Egg for the vici plugin, contributed by Björn Schuberg.


Trivial merge
Michael's strongswan development tree