Merged revisons 3687-3748 from 3.0.5 stable branch.

tbrehm

2013-01-03 10b4c85a7686da07bddb5779f8ceea48acdf412e

 server/conf/vhost.conf.master

@@ -234,7 +234,7 @@
</tmpl_if>
<tmpl_if name='php' op='==' value='php-fpm'>
      <IfModule mod_fastcgi.c>
            <Directory /usr/lib/cgi-bin>
            <Directory {tmpl_var name='document_root'}/cgi-bin>
                  Order allow,deny
                  Allow from all
             </Directory>