Merge branch 'master' into 'master'

Marius Cramer

2015-06-03 c3fab8f2cdf92d6b9d66202e3210cc01e5c53db5

Merge branch 'master' into 'master'

FS#1212 - IP Address in fetchmail - allow ipv4 or hostname for pop/imap-server

See merge request !196

 interface/web/mail/form/mail_get.tform.php

@@ -94,7 +94,7 @@
            'validators' => array (  0 => array ( 'type' => 'NOTEMPTY',
                    'errmsg'=> 'source_server_error_isempty'),
                1 => array ( 'type' => 'REGEX',
                    'regex' => '/^[\w\.\-]{2,64}\.[a-zA-Z\-]{2,10}$/',
                    'regex' => '/^([\w\.\-]{2,64}\.[a-zA-Z\-]{2,10}|(?:[0-9]{1,3}\.){3}[0-9]{1,3})$/',
                    'errmsg'=> 'source_server_error_regex'),
            ),
            'default' => '',