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)
commitd728d7faa6c60f185be72510d87bcc565bc0846a
tree4d2ed7404804998cbc10abf0419fac34719c57be
parentabab50081c8c12cc46482a43264deb46853bb8fa
parentdcd719908229479b0b6ec14d6c1362eb82b1bbf3
Merge pull request #1093 from poettering/unified-prepare

A variety of clean-ups