Merge remote-tracking branch 'ispc/master'

Marius Cramer

2014-11-04 108dd9249196fbcdd5965226e679142a6a0374f5

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