]> 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: e4ded84 2806efe)
Merge commit 'stevee/lighttpd' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Mar 2010 15:41:23 +0000 (16:41 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Mar 2010 15:41:23 +0000 (16:41 +0100)

Trivial merge
IPFire 3.x development tree