]> 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 | combined (merge: 49c7a4b 0cf124a)
Merge branch 'strongswan-next' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 9 Apr 2013 10:41:40 +0000 (12:41 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 9 Apr 2013 10:41:40 +0000 (12:41 +0200)

Trivial merge
Timo's tree of IPFire 2.x