commit 61332e9428635f69d61b8699b7edf16dbf9b3687
Merge: 5e67cc2 4ddce51
Author: Klaus Aehlig <[email protected]>
Date: Wed Sep 24 17:31:22 2014 +0200
Merge branch 'stable-2.12' into master
* stable-2.12
metad: run as root to bind port 80
WConfd: run as <prefix>-masterd by default
WConfd: use own server config instead of LuxiD's
Fix typo in reason source
Signed-off-by: Klaus Aehlig <[email protected]>
--
Klaus Aehlig
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
