]> 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: c381e46 d69eb03)
Merge branch 'dnssec'
authorTobias Brunner <tobias@strongswan.org>
Tue, 19 Feb 2013 11:25:27 +0000 (12:25 +0100)
committerTobias Brunner <tobias@strongswan.org>
Tue, 19 Feb 2013 11:25:27 +0000 (12:25 +0100)

Trivial merge
Michael's strongswan development tree