Merge pull request #1093 from poettering/unified-prepare
authorDaniel Mack <github@zonque.org>
Mon, 31 Aug 2015 11:58:29 +0000 (13:58 +0200)
committerDaniel Mack <github@zonque.org>
Mon, 31 Aug 2015 11:58:29 +0000 (13:58 +0200)
A variety of clean-ups


Trivial merge