Included changes from stable that could not be merged

Marius Cramer

2014-01-28 746e52a6f3cfdd6438f9c62b39c119925a9405f9

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