]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/commitdiff
projects / people / amarx / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5e211a 7290e7d)
Merge remote-tracking branch 'arne_f/strongswan'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 6 May 2012 16:31:41 +0000 (18:31 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 6 May 2012 16:31:41 +0000 (18:31 +0200)

Trivial merge
Alex's tree of IPFire 3.x