Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-29 d30f2c69b1fbfcb9bebe17996d11dc4863afd8bc

 interface/web/client/templates/domain_list.htm

@@ -45,10 +45,10 @@

            <tfoot>
                <tr>
                    <td colspan="4"><tmpl_var name="paging"></td>
                    <td colspan="3"><tmpl_var name="paging"></td>
                </tr>
            </tfoot>
            </table>
</div>