]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
projects / people / ms / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 723a1c8 f59c3c0)
Merge remote-tracking branch 'stevee/strongswan'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 3 Mar 2012 17:30:53 +0000 (18:30 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 3 Mar 2012 17:30:53 +0000 (18:30 +0100)

Trivial merge
Michael's tree of IPFire 3.x.