shyouhei	2008-07-10 18:43:07 +0900 (Thu, 10 Jul 2008)

  New Revision: 18002

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18002

  Log:
    merge revision(s) 17881:
    * lib/erb.rb (PercentScanner#scan): fix %% line bug. [ruby-core:17491]
    * test/erb/test_erb.rb (test_percent): ditto.

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/erb.rb
    branches/ruby_1_8_7/test/erb/test_erb.rb
    branches/ruby_1_8_7/version.h