Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develo

gcm test
Conflicts:
	app/views/boards/show.html.erb

app/views/boards/show.html.erb

@@ -91,14 +91,13 @@
       </td>
     </tr> -->
   <% end %>
+  <!-- </tbody>
+</table> -->
+<div class="pagination"><%= pagination_links_full @topic_pages, @topic_count %></div>
 <% else %>
 <p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
 </div>
-  <!-- </tbody>
-</table> -->
-<div class="pagination"><%= pagination_links_full @topic_pages, @topic_count %></div>
-
 
 <% other_formats_links do |f| %>
   <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>