merges r23500 from trunk into ruby_1_9_1.

--

* spec/.gitignore: ignores rubyspec/ and mspec/.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23538 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index ba83425b4..da48282c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed May 20 20:54:37 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* spec/.gitignore: ignores rubyspec/ and mspec/.
+
 Wed May 20 06:20:05 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/tempfile.rb (Tempfile#unlink): close first for Windows.  a
diff --git a/spec/.gitignore b/spec/.gitignore
new file mode 100644
index 000000000..51a68fe8b
--- /dev/null
+++ b/spec/.gitignore
@@ -0,0 +1,2 @@
+rubyspec
+mspec
diff --git a/version.h b/version.h
index eb106f685..3a87a97c6 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-12"
-#define RUBY_PATCHLEVEL 152
+#define RUBY_PATCHLEVEL 153
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1