Merge branch 'develop'

James Moger

2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70

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

@@ -271,7 +271,7 @@
                  final RepositoryCommit commit = commitItem.getModelObject();

                  // author gravatar
                  commitItem.add(new GravatarImage("commitAuthor", commit.getAuthorIdent(), null, 16, false));
                  commitItem.add(new AvatarImage("commitAuthor", commit.getAuthorIdent(), null, 16, false));

                  // merge icon
                  if (commit.getParentCount() > 1) {