Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
<h2><tmpl_var name="page_head_txt"></h2>
<p><tmpl_var name="page_desc_txt"></p>
 
<div class="panel panel_tools_interface">
 
    <div class="pnl_formsarea">
        <fieldset class="inlineLabels">
            <h2 class="frmTextHead"></h2><p>&nbsp;</p>
            
        </fieldset>
        
        <input type="hidden" name="id" value="{tmpl_var name='id'}">
            
        <div class="buttonHolder buttons">
            &nbsp;
        </div>
    </div>
  
</div>