Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

 interface/web/admin/list/groups.list.php

@@ -22,7 +22,7 @@
$liste['search_prefix']    = 'search_';

//* Records per page
$liste['records_per_page']    = 15;
$liste['records_per_page']    = "15";

//* Script file for listing
$liste['file']            = 'groups_list.php';