Merge branch 'revert-7827db36' into 'stable-3.1'

Pascal Dreissen

2016-07-08 6a00e0d41d0a7267878afa1b751427b26853e2f6

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