Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/admin/form/server_config.tform.php

@@ -170,7 +170,7 @@
         'formtype' => 'TEXT',
         'default' => '/var/backup',
         'validators' => array(   0 => array (    'type' => 'REGEX',
                              'regex' => "/(|^\\/{1,2}(?:[\\w-]+[.]?\\/?){5,128})$/";
                              'regex' => "/(|^\\/{1,2}(?:[\\w-]+[.]?\\/?){5,128})$/",
                              'errmsg'=> 'backup_dir_error_regex'),
         ),
         'value' => '',