Merge branch 'master' into develop

James Moger

2014-05-07 0fbf8052cc0c6272baf64d8de2d07d2cdbf3a287

 src/test/java/com/gitblit/tests/GroovyScriptTest.java

@@ -338,6 +338,10 @@
         return dv;

      }



      public int getInteger(String key, int defaultValue) {

         return defaultValue;

      }



      public void sendMail(String subject, String message, Collection<String> toAddresses) {

         messages.add(new MockMail(subject, message, toAddresses));

      }