Merge branch 'master' into rpc

James Moger

2011-10-06 cc5ad8d53bcf953eb60e11dcf72aa9f69ec043f3

 tests/com/gitblit/tests/GitBlitTest.java

@@ -39,8 +39,7 @@
      assertTrue("Helloworld model is null!", model != null);

      assertTrue(model.toString().equals(

            GitBlitSuite.getHelloworldRepository().getDirectory().getName()));

      assertEquals("" + GitBlit.self().calculateSize(model), GitBlit.self().calculateSize(model),

            22004L);

      assertTrue(GitBlit.self().calculateSize(model) > 22000L);

   }



   public void testUserModel() throws Exception {