]> 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: 1aeacca 78adb5a)
Merge branch 'test-timing'
authorAndreas Steffen <andreas.steffen@strongswan.org>
Sun, 15 May 2016 17:03:49 +0000 (19:03 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Sun, 15 May 2016 17:03:49 +0000 (19:03 +0200)

Trivial merge
Michael's strongswan development tree