Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-30 5e981c0c36166071298a6b82cead9f81310842ab

 interface/web/dns/lib/lang/es_dns_template.lng

old mode 100644
new mode 100755
@@ -1,6 +1,6 @@
<?php
$wb['name_txt'] = 'Nombre';
$wb['fields_txt'] = 'Campos';
$wb['name_txt'] = 'Nombre';
$wb['template_txt'] = 'Plantilla';
$wb['visible_txt'] = 'Visible';
?>
?>