Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Marius Cramer

2014-10-24 919c23676940bee3a7b21ec98700ea74152f1615

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