Merge overrides in addition to merging the normal settings

James Moger

2014-03-17 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7

 src/main/java/com/gitblit/tickets/QueryBuilder.java

@@ -201,6 +201,12 @@
            q = q.substring(1, q.length() - 1);
         }
      }
      if (q.startsWith("AND ")) {
         q = q.substring(3).trim();
      }
      if (q.startsWith("OR ")) {
         q = q.substring(2).trim();
      }
      return q;
   }