merge revision(s) 34333:

	* misc/rdoc-mode.el (rdoc-mode): Add provide so that requiring
	  this library succeeds.


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

3 files changed, 8 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 9f88834908..46d82124fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb 12 16:56:23 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/rdoc-mode.el (rdoc-mode): Add provide so that requiring
+	  this library succeeds.
+
 Sun Feb 12 16:53:18 2012  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/tempfile.rb (Tempfile#unlink, Tempfile::Remover#call): Just
diff --git a/misc/rdoc-mode.el b/misc/rdoc-mode.el
index aa3e223b32..a5fea70ce3 100644
--- a/misc/rdoc-mode.el
+++ b/misc/rdoc-mode.el
@@ -81,3 +81,5 @@
 	 1 rdoc-description-face)	; labeled | node
    ;(list "^\\s +\\(.*\\)" 1 rdoc-verbatim-face)
    ))
+
+(provide 'rdoc-mode)
diff --git a/version.h b/version.h
index 46cd6b30b6..8f0fe10bbc 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 101
+#define RUBY_PATCHLEVEL 102
 
 #define RUBY_RELEASE_DATE "2012-02-12"
 #define RUBY_RELEASE_YEAR 2012