]> git.ipfire.org Git - ipfire-3.x.git/commit
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)
commitde95f2aeb586c973a78e758deed86efff4d8d498
tree42d84ba2fd060175c6bb2170b8f734d17ce02e0d
parent7cf8ca9c3cfe03bf87300216e253c01e2469713e
parent7e97512ab58ee56e0ff712a06893b612f3260329
Merge remote-tracking branch 'stevee/systemd-215'

Conflicts:
kmod/kmod.nm