]> 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: 08b4415 2ade461)
Merge remote-tracking branch 'ms/strongswan-5' into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 20 Jul 2012 07:04:42 +0000 (09:04 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 20 Jul 2012 07:04:42 +0000 (09:04 +0200)

Trivial merge
Timo's tree of IPFire 2.x