Merge branch 'fix-3984' into 'stable-3.1'

Marius Burkard

2016-07-08 9bcd2fd54728b9e634442f584268da03acaea633

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