Merge remote-tracking branch 'mfischer/acpid' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Mar 2015 16:50:34 +0000 (17:50 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Mar 2015 16:50:34 +0000 (17:50 +0100)

Trivial merge