Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-22 62f5b704bcf35b25f5fabbadd8faa9d70b0b3fbf

Merge branch 'master' into 'stable-3.1'

fixed typo



See merge request !300

 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' => '',