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

James Moger

2012-08-24 a44004109e29283ec1eda959c6d480ebb80c5de6

 src/com/gitblit/utils/JsonUtils.java

@@ -295,7 +295,8 @@
            JsonDeserializationContext jsonDeserializationContext) {

         try {

            synchronized (dateFormat) {

               return dateFormat.parse(jsonElement.getAsString());

               Date date = dateFormat.parse(jsonElement.getAsString());					
               return new Date((date.getTime() / 1000) * 1000);

            }

         } catch (ParseException e) {

            throw new JsonSyntaxException(jsonElement.getAsString(), e);