]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/commitdiff
projects / people / amarx / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7cf8ca9 7e97512)
Merge remote-tracking branch 'stevee/systemd-215'
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Jan 2015 22:02:20 +0000 (23:02 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Jan 2015 22:02:20 +0000 (23:02 +0100)
Conflicts:
kmod/kmod.nm


Trivial merge
Alex's tree of IPFire 3.x