Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

 interface/web/sites/database_list.php

@@ -67,7 +67,7 @@
}

$list = new list_action;
$list->SQLOrderBy = 'ORDER BY database_name';
$list->SQLOrderBy = 'ORDER BY web_database.database_name';
$list->onLoad();