]> 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: 31528ce 0e7afdd)
Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 18 Oct 2008 19:09:55 +0000 (21:09 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 18 Oct 2008 19:09:55 +0000 (21:09 +0200)

Trivial merge
IPFire 3.x development tree