]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f8bded 40f0451)
Merge commit 'stevee/strongswan' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Mar 2010 15:40:39 +0000 (16:40 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Mar 2010 15:40:39 +0000 (16:40 +0100)

Trivial merge
IPFire 3.x development tree