Merge branch 'master' into 'master'

Marius Cramer

2015-07-10 4e5e9b5acfdfddc1d8b671890d271a53e5598862

1
2
3
4
 
amavis unix - - - - 2 smtp
        -o smtp_data_done_timeout=1200
        -o smtp_send_xforward_command=yes