Merge branch 'stable-3.1'

Marius Burkard

2016-07-05 165177508f6541b4d0924c6625eb216a9a5a549a

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