Merge remote-tracking branch 'upstream/master' into translation_to_pt-br

Rafael Cavazin

2012-12-07 6b35f8c32de5ebf7bedc429a6ff62709af9d5acd

 src/com/gitblit/utils/ActivityUtils.java

@@ -81,6 +81,10 @@


      Map<String, Activity> activity = new HashMap<String, Activity>();

      for (RepositoryModel model : models) {

         if (model.maxActivityCommits == -1) {

            // skip this repository

            continue;

         }

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

            if (model.isCollectingGarbage) {

               continue;