Merge remote-tracking branch 'gollum/master'

Conflicts:
	lib/gollum/frontend/public/gollum/css/gollum.css

README.md

@@ -284,6 +284,12 @@ specified, default alignment is `left`.
     [[gollum.png|float]]
+By default text will fill up all the space around the image. To control how
+much should show up use this tag to stop and start a new block so that
+additional content doesn't fill in.
+
+    [[_]]
+
 To specify a max-width, use the `width=` option. Units must be specified in
 either `px` or `em`.

lib/gollum-lib/markup.rb

@@ -236,6 +236,8 @@ module Gollum
     def process_tag(tag)
       if tag =~ /^_TOC_$/
         %{[[#{tag}]]}
+      elsif tag =~ /^_$/
+        %{<div class="clearfloats"></div>}
       elsif html = process_image_tag(tag)
         html
       elsif html = process_file_link_tag(tag)