]> 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: 0a1dd65 de2f3e2)
Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 25 Dec 2008 18:52:17 +0000 (19:52 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 25 Dec 2008 18:52:17 +0000 (19:52 +0100)

Trivial merge
IPFire 3.x development tree