Merge branch 'master' into 'master'

Marius Cramer

2014-10-24 2d5fcd53c19a65b9c968a1db2e9af643537379c3

 remoting_client/API-docs/sites_web_aliasdomain_update.html

@@ -47,6 +47,7 @@
<p class="margin"> ssl_organisation_unit&nbsp;&nbsp;(<span class="paratype">varchar(255)</span>)</p>
<p class="margin"> ssl_country&nbsp;&nbsp;(<span class="paratype">varchar(255)</span>)</p>
<p class="margin"> ssl_domain&nbsp;&nbsp;(<span class="paratype">varchar(255)</span>)</p>
<p class="margin"> ssl_key&nbsp;&nbsp;(<span class="paratype">mediumtext</span>)</p>
<p class="margin"> ssl_request&nbsp;&nbsp;(<span class="paratype">mediumtext</span>)</p>
<p class="margin"> ssl_cert&nbsp;&nbsp;(<span class="paratype">mediumtext</span>)</p>
<p class="margin"> ssl_bundle&nbsp;&nbsp;(<span class="paratype">mediumtext</span>)</p>