Merge pull request #898 from poettering/machined-fix-reload
authorDaniel Mack <github@zonque.org>
Thu, 6 Aug 2015 14:13:22 +0000 (16:13 +0200)
committerDaniel Mack <github@zonque.org>
Thu, 6 Aug 2015 14:13:22 +0000 (16:13 +0200)
commit3996b5251ddfcbe0809d1116821f003f2bca45ef
treecd362f9d5068d9c21fa1fa26b9d772f7bf2fdd85
parentcedafc8a7203c788cc45ecaa26935428a7553544
parent49f3fffd94591bdf2bd6c2233a9300daeab79566
Merge pull request #898 from poettering/machined-fix-reload

Fix for #376, plus some other fixes