Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36

 interface/web/client/templates/client_template_list.htm

@@ -49,7 +49,7 @@
                </tbody>
                <tfoot>
                    <tr>
                        <td colspan="7"><tmpl_var name="paging"></td>
                        <td colspan="4"><tmpl_var name="paging"></td>
                    </tr>
                </tfoot>
            </table>