Commit c5cc303d authored by Aaron Patterson's avatar Aaron Patterson

Merge branch 'dtd' of git@github.com:tenderlove/nokogiri into dtd

Conflicts:
	ext/nokogiri/xml_dtd.c
	lib/nokogiri/ffi/xml/dtd.rb
	test/xml/test_dtd.rb
parents e4d73c59 2d2b8b77
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment