Merge pull request #490 from pyssling/master
authorLennart Poettering <lennart@poettering.net>
Tue, 12 Jan 2016 22:30:20 +0000 (23:30 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 12 Jan 2016 22:30:20 +0000 (23:30 +0100)
commitd9a090b9957b04ec34a145a0a40f41abafe73917
tree7441efface736722b60d637133d0e7b6fc80541d
parent7e48712407aaee1f5624c0cb2cc16d633cc314d9
parentee48dbd55f544d9ee4a17497b5757be7e854c869
Merge pull request #490 from pyssling/master

Add machine-id setting
src/core/main.c