Merge branch 'stable-3.1'

Marius Burkard

2016-01-31 3117f2e70389b0a3e03a683ec8b03e4e0a7eea87

 server/conf/php-fcgi-starter.master

@@ -18,5 +18,5 @@
-d suhosin.executor.func.blacklist="" \
-d upload_tmp_dir=<tmpl_var name='document_root'>/tmp \
-d session.save_path=<tmpl_var name='document_root'>/tmp \
-d sendmail_path="/usr/sbin/sendmail -t -i -fwebmaster@<tmpl_var name='domain'>" \
-d sendmail_path="/usr/sbin/sendmail -t -i -f webmaster@<tmpl_var name='domain'>" \
</tmpl_if> $1