Merge branch 'ticket/152' into develop

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

Thu, 4 Sep 2014 18:59:32 +0000 (14:59 -0400)

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

Thu, 4 Sep 2014 18:59:32 +0000 (14:59 -0400)
author James Moger <james.moger@gitblit.com>
Thu, 4 Sep 2014 18:59:32 +0000 (14:59 -0400)
committer James Moger <james.moger@gitblit.com>
Thu, 4 Sep 2014 18:59:32 +0000 (14:59 -0400)
diff --cc src/main/java/com/gitblit/tickets/ITicketService.java
Simple merge
diff --cc src/main/java/com/gitblit/wicket/pages/TicketPage.java
Simple merge
author	James Moger <james.moger@gitblit.com>
	Thu, 4 Sep 2014 18:59:32 +0000 (14:59 -0400)
committer	James Moger <james.moger@gitblit.com>
	Thu, 4 Sep 2014 18:59:32 +0000 (14:59 -0400)
		1	2
src/main/java/com/gitblit/tickets/ITicketService.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/main/java/com/gitblit/wicket/pages/TicketPage.java	patch \|	diff1 \|	diff2 \|	blob \| history