]> 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: 4730139 2b96cb9)
Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 2 Mar 2009 20:57:36 +0000 (21:57 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 2 Mar 2009 20:57:36 +0000 (21:57 +0100)
1  2 
lfs/initscripts patch | diff1 | diff2 | blob | history

diff --cc lfs/initscripts
Simple merge
IPFire 3.x development tree