]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 4f64e20 05f4061)
Merge remote-tracking branch 'ms/strongswan-next' into strongswan-next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 20 Jul 2013 10:54:31 +0000 (12:54 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 20 Jul 2013 10:54:31 +0000 (12:54 +0200)

Trivial merge
Timo's tree of IPFire 2.x