]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed35052 b466eef)
Merge branch 'openswan26' into openswan
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 10 Oct 2008 05:52:39 +0000 (07:52 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 10 Oct 2008 05:52:39 +0000 (07:52 +0200)

Trivial merge
IPFire 2.x development tree