Merge branch 'master' into 'master'

Marius Cramer

2015-07-02 f3ff1e4ba5174dd559890483dd7dded8a04c10fd

 remoting_client/API-docs/sites_web_domain_add.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>