Merge branch 'master' into 'master'

Marius Cramer

2014-10-13 559b657f9fc6a5374de9b7b1caf20abd4e308d76

 server/conf/error/it/400.html

@@ -49,7 +49,7 @@
            <h1>ERROR 400 - Sintassi non corretta!</h1>
        </div>
        <div id="content">
            <h2>Si è verificato il seguente errore:</h2>
            <h2>Si è verificato il seguente errore:</h2>
            <p>Hai usato una sintassi non corretta.</p>
         <p>Contatta il <!--WEBMASTER//-->webmaster<!--WEBMASTER//-->.</p>
        </div>