Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-12 51e1dde2aa5c31b01f77479fe3fc86dffd2c8f29

 remoting_client/API-docs/sites_database_add.html

@@ -20,6 +20,7 @@
<p class="margin"> <span class="var">$session_id</span>, <span class="var">$client_id</span>, <span class="var">$params</span></p>
<p class="headgrp">Parameters (in <span class="var">$params</span>): </p>
<p class="margin"> server_id&nbsp;&nbsp;(<span class="paratype">int(11)</span>)</p>
<p class="margin"> website_id&nbsp;&nbsp;(<span class="paratype">int(11)</span>)</p>
<p class="margin"> type&nbsp;&nbsp;(<span class="paratype">varchar(16)</span>)</p>
<p class="margin"> database_name&nbsp;&nbsp;(<span class="paratype">varchar(64)</span>)</p>
<p class="margin"> database_user_id&nbsp;&nbsp;(<span class="paratype">int(11)</span>)</p>