Merge branch 'master' into 'master'

Marius Cramer

2015-03-09 e564b4796a4256a67328e117c9675ccae7d872cd

 interface/web/admin/software_repo_edit.php

@@ -43,6 +43,7 @@

//* Check permissions for module
$app->auth->check_module_permissions('admin');
$app->auth->check_security_permissions('admin_allow_software_repo');
if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');

// Loading classes