Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-07-08 341ef7175af7c8f21d27262b58da8f5bc2c06ef0

 interface/lib/classes/validate_reseller.inc.php

@@ -36,8 +36,8 @@
   function limit_client($field_name, $field_value, $validator) {
      global $app;

      if($field_value <= 0) {
         return $app->tform->lng('limit_client_error_positive');
      if($field_value <= 0 && $field_value != -1) {
         return $app->tform->lng('limit_client_error_positive_or_unlimited');
      } else {
         return '';
      }