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

Till Brehm

2014-11-12 40317cfd73aaa530e3c4ad8488a40c3a9b611f17

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