Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...

[rails.git] / app / views / browse / _tag.rhtml

<tr>
  <td><%= h(tag[0]) %> = <%= h(tag[1]) %></td>
</tr>