Merge branch 'ticket/103' into release-v1.6.0

James Moger

2014-06-13 54a6acc53a150e3a52265fd6fb684d239b0918b2

 src/main/java/com/gitblit/utils/JsonUtils.java

@@ -274,10 +274,10 @@
      return builder.create();

   }



   private static class GmtDateTypeAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> {

   public static class GmtDateTypeAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> {

      private final DateFormat dateFormat;



      private GmtDateTypeAdapter() {

      public GmtDateTypeAdapter() {

         dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);

         dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));

      }