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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 4 deletions

diff --git a/version.h b/version.h
index fa9b340f28..52dd1826b8 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-06-22"
+#define RUBY_RELEASE_DATE "2008-06-24"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080622
-#define RUBY_PATCHLEVEL 231
+#define RUBY_RELEASE_CODE 20080624
+#define RUBY_PATCHLEVEL 232
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 24
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];