Merge pull request #1469 from poettering/even-more-fixed
authorDaniel Mack <github@zonque.org>
Tue, 6 Oct 2015 12:59:24 +0000 (14:59 +0200)
committerDaniel Mack <github@zonque.org>
Tue, 6 Oct 2015 12:59:24 +0000 (14:59 +0200)
Even more fixes


Trivial merge