merge revision(s) 18417:

	* lib/net/ftp.rb (login): raise FTPReplyError if passwd or acct
	  is not supplied.  backported from trunk.  fixed [ruby-core:18058].


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

1 files changed, 4 insertions, 4 deletions

diff --git a/version.h b/version.h
index 207666ee0a..3b2d4cf111 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2009-01-12"
+#define RUBY_RELEASE_DATE "2009-01-13"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20090112
-#define RUBY_PATCHLEVEL 296
+#define RUBY_RELEASE_CODE 20090113
+#define RUBY_PATCHLEVEL 297
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DAY 13
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];