]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 72d70ec 9062e23)
Merge branch 'jwhois'
authorStefan Schantl <Stevee@ipfire.org>
Fri, 25 Sep 2009 16:37:04 +0000 (18:37 +0200)
committerStefan Schantl <Stevee@ipfire.org>
Fri, 25 Sep 2009 16:37:04 +0000 (18:37 +0200)

Trivial merge
IPFire 3.x development tree