Meerged revisions 2265-2278 from stable branch.

tbrehm

2011-04-05 f5d9544164b039001906db98b59c92f7250553fb

 server/conf/bind_pri.domain.master

@@ -12,7 +12,7 @@
{tmpl_var name='name'}      NS        {tmpl_var name='data'}
</tmpl_if>
<tmpl_if name="type" op='==' value='A'>
{tmpl_var name='name'}      A        {tmpl_var name='data'}
{tmpl_var name='name'} {tmpl_var name='ttl'} A        {tmpl_var name='data'}
</tmpl_if>
<tmpl_if name="type" op='==' value='AAAA'>
{tmpl_var name='name'}      AAAA        {tmpl_var name='data'}