]> 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: 4f1d2f2 2a26566)
Merge branch 'swima-reserved'
authorAndreas Steffen <andreas.steffen@strongswan.org>
Tue, 12 Jun 2018 19:49:54 +0000 (21:49 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Tue, 12 Jun 2018 19:49:54 +0000 (21:49 +0200)

Trivial merge
Michael's strongswan development tree