Merge from ruby_1_8.

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

2 files changed, 12 insertions, 3 deletions

diff --git a/NEWS b/NEWS
index a59febc3ef..2f371027c3 100644
--- a/NEWS
+++ b/NEWS
@@ -369,6 +369,15 @@ with all sufficient information, see the ChangeLog file.
   The old behavior was inconsistent with Ruby syntax and considered as
   a bug.
 
+* date
+
+  * Date.parse
+
+    '##.##.##' (where each '#' is a digit) is now taken as 'YY.MM.DD'
+    instead of 'MM.DD.YY'.  While the change may confuse you, you can
+    always use Date.strptime() when you know what you are dealing
+    with.
+
 * tempfile
 
   * The file name format has changed.  No dots are included by default
diff --git a/version.h b/version.h
index c4e0f53dc8..0311bcf6ee 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-05-25"
+#define RUBY_RELEASE_DATE "2008-05-26"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20080525
+#define RUBY_RELEASE_CODE 20080526
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 25
+#define RUBY_RELEASE_DAY 26
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];