From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 28 Jan 2015 22:02:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'stevee/systemd-215'
X-Git-Url: http://git.ipfire.org/?p=people%2Famarx%2Fipfire-3.x.git;a=commitdiff_plain;h=de95f2aeb586c973a78e758deed86efff4d8d498

Merge remote-tracking branch 'stevee/systemd-215'

Conflicts:
	kmod/kmod.nm
---

de95f2aeb586c973a78e758deed86efff4d8d498