Merge branch 'feature/php-fpm-envpath' into 'stable-3.1'

Marius Burkard

2016-07-04 d2ed125e392bd5046a7a2499dc05b798486a1c79

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