Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

florian030

2014-02-18 1e7805788df0591a6007042e564a5b3b9d00b959

 interface/web/client/form/domain.tform.php

@@ -100,7 +100,7 @@
            1 => array ( 'type' => 'UNIQUE',
               'errmsg'=> 'domain_error_unique'),
            2 => array ( 'type' => 'REGEX',
               'regex' => '/^[\w\.\-]{2,255}\.[a-zA-Z\-]{2,10}$/',
               'regex' => '/^[\w\.\-]{2,255}\.[a-zA-Z0-9\-]{2,30}$/',
               'errmsg'=> 'domain_error_regex'),
         ),
         'default' => '',