Merge branch 'master' into 'master'

Marius Cramer

2014-04-30 e25e407913f0248ba6d68fa80b001b0f4621d99a

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