]> git.ipfire.org Git - people/pmueller/ipfire-3.x.git/commitdiff
projects / people / pmueller / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de95f2a 61f6dae)
Merge remote-tracking branch 'stevee/sysvinit'
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Jan 2015 22:02:51 +0000 (23:02 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Jan 2015 22:02:51 +0000 (23:02 +0100)

Trivial merge
Peter's tree of IPFire 3.x