Merge commit 'ea70d8ac7ae26f' into amp

lib/jekyll/filters.rb

@@ -36,4 +36,4 @@ module Jekyll
     end
 
   end  
-end
+end

test/test_filters.rb

@@ -29,4 +29,9 @@ class TestFilters < Test::Unit::TestCase
     assert_equal "chunky, bacon, bits, and pieces", @filter.array_to_sentence_string(["chunky", "bacon", "bits", "pieces"])
   end
   
-end
+  def test_xml_escape_with_ampersands
+    assert_equal "AT&amp;T", @filter.xml_escape("AT&T")
+    assert_equal "&lt;code&gt;command &amp;lt;filename&amp;gt;&lt;/code&gt;", @filter.xml_escape("<code>command &lt;filename&gt;</code>")
+  end
+  
+end