Merge pull request #1767 from poettering/journald-watchdog
authorDaniel Mack <github@zonque.org>
Tue, 3 Nov 2015 16:53:15 +0000 (17:53 +0100)
committerDaniel Mack <github@zonque.org>
Tue, 3 Nov 2015 16:53:15 +0000 (17:53 +0100)
restore journald watchdog


Trivial merge