Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/admin/templates/server_ip_list.htm

@@ -62,8 +62,3 @@
                </tfoot>
            </table>
</div>
<script>
$(document).ready(function(){
   $('[data-toggle="tooltip"]').tooltip();
});
</script>