Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 05beae43cfeb15ea89b984d36105dcdbdffd0975

 interface/web/sites/webdav_user_list.php

@@ -44,7 +44,7 @@
$app->auth->check_module_permissions('sites');

$app->uses('listform_actions');
$app->listform_actions->SQLOrderBy = 'ORDER BY username';
$app->listform_actions->SQLOrderBy = 'ORDER BY webdav_user.username';
$app->listform_actions->onLoad();