Merge branch 'strip-html' of https://github.com/joliss/liquid into joliss-strip-html

Conflicts:
	lib/liquid/standardfilters.rb

lib/liquid/standardfilters.rb

@@ -65,7 +65,7 @@ module Liquid
     end
 
     def strip_html(input)
-      input.to_s.gsub(/<script.*?<\/script>/, '').gsub(/<!--.*?-->/, '').gsub(/<.*?>/, '')
+      input.to_s.gsub(/<script.*?<\/script>/m, '').gsub(/<!--.*?-->/m, '').gsub(/<.*?>/m, '')
     end
 
     # Remove all newlines from the string
@@ -73,7 +73,6 @@ module Liquid
       input.to_s.gsub(/\r?\n/, '')
     end
 
-
     # Join elements of the array with certain character between them
     def join(input, glue = ' ')
       [input].flatten.join(glue)