Merge changes I343e1e25,I8bf03317
authorLucas Werkmeister <mail@lucaswerkmeister.de>
Tue, 30 Aug 2016 17:43:05 +0000 (19:43 +0200)
committerGerrit Code Review <gigi-system@dogcraft.de>
Tue, 30 Aug 2016 17:43:05 +0000 (19:43 +0200)
* changes:
  Support socket activation
  Support reading configuration from file


Trivial merge