From 6b35f8c32de5ebf7bedc429a6ff62709af9d5acd Mon Sep 17 00:00:00 2001
From: Rafael Cavazin <rafaelcavazin@gmail.com>
Date: Fri, 07 Dec 2012 08:24:16 -0500
Subject: [PATCH] Merge remote-tracking branch 'upstream/master' into translation_to_pt-br

---
 src/com/gitblit/models/RepositoryModel.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/com/gitblit/models/RepositoryModel.java b/src/com/gitblit/models/RepositoryModel.java
index 23ce9e3..5be33a2 100644
--- a/src/com/gitblit/models/RepositoryModel.java
+++ b/src/com/gitblit/models/RepositoryModel.java
@@ -77,7 +77,8 @@
 	public String originRepository;
 	public boolean verifyCommitter;
 	public String gcThreshold;
-	public String gcPeriod;
+	public int gcPeriod;
+	public int maxActivityCommits;
 	
 	public transient boolean isCollectingGarbage;
 	public Date lastGC;

--
Gitblit v1.9.1