Merge branch 'ticket/87' into develop

author James Moger <james.moger@gitblit.com>

Thu, 29 May 2014 14:47:12 +0000 (10:47 -0400)

committer James Moger <james.moger@gitblit.com>

Thu, 29 May 2014 14:47:12 +0000 (10:47 -0400)
author James Moger <james.moger@gitblit.com>
Thu, 29 May 2014 14:47:12 +0000 (10:47 -0400)
committer James Moger <james.moger@gitblit.com>
Thu, 29 May 2014 14:47:12 +0000 (10:47 -0400)
diff --cc src/main/java/com/gitblit/wicket/pages/TicketPage.java
Simple merge
author	James Moger <james.moger@gitblit.com>
	Thu, 29 May 2014 14:47:12 +0000 (10:47 -0400)
committer	James Moger <james.moger@gitblit.com>
	Thu, 29 May 2014 14:47:12 +0000 (10:47 -0400)