diff --git a/pylons_app/templates/shortlog_data.html b/pylons_app/templates/shortlog_data.html
--- a/pylons_app/templates/shortlog_data.html
+++ b/pylons_app/templates/shortlog_data.html
@@ -7,7 +7,14 @@ from pylons_app.lib import filters
 	<tr class="parity${cnt%2}">
 		<td>${cs._ctx.date()|n,filters.age}</td>
 		<td title="${cs.author}">${cs.author|n,filters.person}</td>
-		<td>${h.link_to(cs.message,h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))}</td>
+		<td>${h.link_to(cs.message,h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))}
+			<span class="logtags">
+				<span class="branchtag">${cs.branch}</span>
+				%for tag in cs.tags:
+					<span class="tagtag">${tag}</span>
+				%endfor
+			</span>		
+		</td>
 		<td class="nowrap">
 		${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))}
 		|