Merge remote-tracking branch 'ispc/master' into new-layout-3.1

Marius Cramer

2015-01-06 9724f8f13bdc6bfb2f9649c54ad37fb45bea9870

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