]> 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: 920306e 9e42c68)
Merge commit 'stevee/initscripts' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 11 Jun 2010 22:50:46 +0000 (00:50 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 11 Jun 2010 22:50:46 +0000 (00:50 +0200)

Trivial merge
IPFire 3.x development tree