Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

Florian Schaal

2014-12-14 a549793dccc43cbbd47b40fb339c1a1c37cbc6e6

 interface/web/sites/templates/web_vhost_domain_ssl.htm

@@ -64,6 +64,14 @@
                    {tmpl_var name='ssl_action'}
                </select>
            </div>
         {tmpl_if name="is_spdy_enabled"}
         <div class="ctrlHolder">
            <p class="label">{tmpl_var name='enable_spdy_txt'}</p>
            <div class="multiField">
               {tmpl_var name="enable_spdy"}
            </div>
         </div>
         {/tmpl_if}
        </fieldset>

        <input type="hidden" name="id" value="{tmpl_var name='id'}">
@@ -74,4 +82,4 @@
        </div>
    </div>

</div>
</div>