Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

1
2
3
4
5
6
7
8
<?php 
 
// No settings yet 
//$items[] = array(   'title'     => 'Default Theme', 
//                    'target'     => 'content', 
//                    'link'    => 'tools/tpl_default.php', 
//                    'html_id'   => 'tpl_default'); 
?>