Fix conflict with assert_tag and Glue gem (closes #2255) [david.felstead@gmail.com]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2905 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

actionpack/CHANGELOG

 *SVN*
 
+* Fix conflict with assert_tag and Glue gem #2255 [david.felstead@gmail.com]
+
 * Add documentation to assert_tag indicating that it only works with well-formed XHTML #1937, #2570 [Jamis Buck]
 
 * Added action_pack.rb stub so that ActionPack::Version loads properly [Sam Stephenson]

actionpack/lib/action_controller/vendor/html-scanner/html/document.rb

-require 'html/tokenizer'
-require 'html/node'
+require File.dirname(__FILE__) + '/tokenizer'
+require File.dirname(__FILE__) + '/node'
 
 module HTML #:nodoc: