Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-03-20 0832c839f8141f9f52ce3328db3da2607a394eae

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