Merge branch 'master' of https://github.com/gitblit/gitblit into enhancedLdap

mschaefers

2012-12-03 ba6ae959b8e21c714c69f66254e82837d45a3ed2

 src/com/gitblit/utils/ActivityUtils.java

@@ -82,6 +82,9 @@
      Map<String, Activity> activity = new HashMap<String, Activity>();

      for (RepositoryModel model : models) {

         if (model.hasCommits && model.lastChange.after(thresholdDate)) {

            if (model.isCollectingGarbage) {

               continue;

            }

            Repository repository = GitBlit.self()

                  .getRepository(model.name);

            List<String> branches = new ArrayList<String>();