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/client/UsersTableModel.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/gitblit/client/UsersTableModel.java b/src/com/gitblit/client/UsersTableModel.java
index f635f7e..b8ce45d 100644
--- a/src/com/gitblit/client/UsersTableModel.java
+++ b/src/com/gitblit/client/UsersTableModel.java
@@ -110,8 +110,8 @@
 			return (model.teams == null || model.teams.size() == 0) ? "" : String
 					.valueOf(model.teams.size());
 		case Repositories:
-			return (model.repositories == null || model.repositories.size() == 0) ? "" : String
-					.valueOf(model.repositories.size());
+			return (model.permissions == null || model.permissions.size() == 0) ? "" : String
+					.valueOf(model.permissions.size());
 		}
 		return null;
 	}

--
Gitblit v1.9.1