Merge pull request #157 from ds5apn/master

James Moger

2014-03-09 08bca7b42fc0435797c01eded969472ce9c60340

 src/main/java/com/gitblit/models/TicketModel.java

@@ -1207,7 +1207,7 @@

      public static Status [] bugWorkflow = { Open, Fixed, Wontfix, Duplicate, Invalid, On_Hold };

      public static Status [] proposalWorkflow = { Open, Declined, On_Hold};
      public static Status [] proposalWorkflow = { Open, Resolved, Declined, On_Hold};

      @Override
      public String toString() {