Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into st...

Till Brehm

2016-05-27 51a7b5e29a1cbf53e9858a6b11aa0be1f8fc59d2

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