shyouhei	2008-06-24 16:16:52 +0900 (Tue, 24 Jun 2008)

  New Revision: 17555

  Added files:
    branches/ruby_1_8_6/test/erb/hello.erb
  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/lib/erb.rb
    branches/ruby_1_8_6/test/erb/test_erb.rb
    branches/ruby_1_8_6/version.h

  Log:
    merge revision(s) 16763:
    * lib/erb.rb (ERB::Compiler::TrimScanner#explicit_trim_line): Fix 
      without strscan problems. [ruby_core:17028].
    * test/erb/test_erb.rb (TestERBCoreWOStrScan): Add test class for 
      without strscan.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/lib/erb.rb?r1=17555&r2=17554&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=17555&r2=17554&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=17555&r2=17554&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/test/erb/test_erb.rb?r1=17555&r2=17554&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/test/erb/hello.erb