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

mschaefers

2012-12-03 ba6ae959b8e21c714c69f66254e82837d45a3ed2

 src/com/gitblit/models/UserModel.java

@@ -56,6 +56,11 @@
   public String cookie;

   public String displayName;

   public String emailAddress;

   public String organizationalUnit;

   public String organization;

   public String locality;

   public String stateProvince;

   public String countryCode;

   public boolean canAdmin;

   public boolean canFork;

   public boolean canCreate;