Merge branch 'master' into 'master'

Marius Cramer

2015-01-30 24625933313891b12d198b84c1d6f42d041fd3d7

 interface/web/dns/dns_dkim_edit.php

old mode 100755
new mode 100644
@@ -108,6 +108,7 @@
      if (!empty($this->dataRecord['data'])) {
         $this->dataRecord['data']='v=DKIM1; t=s; p='.$this->dataRecord['data'];
         $this->dataRecord['name']=$this->dataRecord['selector'].'._domainkey.'.$this->dataRecord['name'];
         $this->dataRecord['ttl']=60;
      }
         // Update the serial number  and timestamp of the RR record
         $soa = $app->db->queryOneRecord("SELECT serial FROM dns_rr WHERE id = ?", $this->id);