From: Daniel Mack <github@zonque.org>
Date: Mon, 31 Aug 2015 11:58:29 +0000 (+0200)
Subject: Merge pull request #1093 from poettering/unified-prepare
X-Git-Tag: v226~65
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d728d7faa6c60f185be72510d87bcc565bc0846a;p=thirdparty%2Fsystemd.git

Merge pull request #1093 from poettering/unified-prepare

A variety of clean-ups
---

d728d7faa6c60f185be72510d87bcc565bc0846a