Merge remote-tracking branch 'sebj/master' and tidied up merged code

Marius Cramer

2013-11-18 015dffdc589b396d72092583cc526674f0a9a8d5

1
2
3
4
5
6
7
8
<?php
 
/*
    The admin.conf.php file contains menu definitions to be displayed in the administration module.
*/
 
 
?>