Merge branch 'master' into develop

James Moger

2014-05-07 0fbf8052cc0c6272baf64d8de2d07d2cdbf3a287

 src/main/java/com/gitblit/tickets/TicketLabel.java

@@ -30,14 +30,17 @@

   private static final long serialVersionUID = 1L;

   public final String name;
   public String name;

   public String color;

   public List<QueryResult> tickets;


   public TicketLabel(String name) {
      setName(name);
   }
	
   public void setName(String name) {
      this.name = name;
      this.color = StringUtils.getColor(name);
   }