Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

 src/main/java/com/gitblit/wicket/panels/LogPanel.java

@@ -109,7 +109,7 @@
         @Override

         public void populateItem(final Item<RevCommit> item) {

            final RevCommit entry = item.getModelObject();

            final Date date = JGitUtils.getCommitDate(entry);

            final Date date = JGitUtils.getAuthorDate(entry);

            final boolean isMerge = entry.getParentCount() > 1;



            item.add(WicketUtils.createDateLabel("commitDate", date, getTimeZone(), getTimeUtils()));