Merge branch 'master' into 'master'

Marius Cramer

2015-06-29 7bcf62fc4e4b119c68998e2570005695eb5778f8

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