Merge branch 'master' into 'master'

Marius Cramer

2015-02-26 7cbed050417f967f34340661b7d7a8a7e42e5710

 interface/lib/classes/validate_domain.inc.php

@@ -123,7 +123,7 @@
                  foreach($regex as $r) {
                     if(preg_match(trim($r),$directive)) {
                        $blocked = true;
                        $blocked_line = $directive;
                        $blocked_line .= $directive.'<br />';
                     };
                  }
               }