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

Marius Cramer

2014-05-12 f1634087ea8a852b58ec13d5099e94771ed80849

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