Merge branch 'master' into 'master'

Marius Cramer

2015-01-05 dee987b263b021b990ea4c62cb15be47c6d61fb5

 interface/web/client/domain_list.php

@@ -46,11 +46,6 @@

$app->uses('listform_actions');

if(isset($_SESSION['show_warning_msg'])) {
   $app->tpl->setloop('warning', array(array('warning_msg' => '<p>'.$_SESSION['show_warning_msg'].'</p>')));
   unset($_SESSION['show_warning_msg']);
}

$app->listform_actions->SQLOrderBy = 'ORDER BY domain.domain';
$app->listform_actions->onLoad();