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)
commitd7faeb9059063a213bfb0dad5d91f5732c3c6a48
tree8ddbe68769057c57c503f46c9d3061cfeaeaac36
parentc256866ad0f399530c686380db62b47883e3f63b
parent234dae50395faa589810f0b1d8d6b7a0fba7393f
Merge changes I343e1e25,I8bf03317

* changes:
  Support socket activation
  Support reading configuration from file