Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-13 c420e715c5bf53527b5828b0de3fa3b52bdff4d1

1
2
3
4
pwcheck_method: authdaemond
log_level: 3
mech_list: PLAIN LOGIN
authdaemond_path:/var/spool/authdaemon/socket