Merge branch 'stable-3.1'

Marius Burkard

2016-02-12 b0f818efec0b74741d6fa53d0e86a95065d4e2d1

 interface/web/dns/form/dns_dkim.tform.php

@@ -120,7 +120,7 @@
                     'range' => '60:',
                     'errmsg'=> 'ttl_range_error'),
         ),
         'default' => '86400',
         'default' => '3600',
         'value'  => '',
         'width'  => '10',
         'maxlength' => '10'