]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 421102e b8e25fc)
Merge branch 'strongswan-5' into thirteen
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 Oct 2012 22:30:33 +0000 (00:30 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 Oct 2012 22:30:33 +0000 (00:30 +0200)

Trivial merge
IPFire 2.x development tree