]> 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: 1cf4021 cdd964e)
Merge branch 'next' into installer
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 16 Oct 2010 21:19:39 +0000 (23:19 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 16 Oct 2010 21:19:39 +0000 (23:19 +0200)

Trivial merge
IPFire 3.x development tree