Merge branch 'hotfix/1.15.10' into stable

rvm · Sep 25, 2012 · c86fb1d · c86fb1d
2 parents f270c11 + 9517277
commit c86fb1d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.15.9
+1.15.10
diff --git a/config/known b/config/known
@@ -32,7 +32,7 @@ jruby-1.6.7
 jruby-1.6.7.2
 jruby[-1.6.8]
 jruby-head
-jruby-1.7.0.preview2
+jruby-1.7.0.RC1
 
 # Rubinius
 rbx-1.0.1

diff --git a/config/md5 b/config/md5
@@ -31,6 +31,7 @@ jruby-bin-1.6.7.2.tar.gz=1e520f1b5130114464e5f1950cb24774
 jruby-bin-1.6.8.tar.gz=a76ac5845640e4a1ebdfa74421efc935
 jruby-bin-1.7.0.preview1.tar.gz=7b9e5e1cd0d818d0199086d948f948b4
 jruby-bin-1.7.0.preview2.tar.gz=e8f1623759590aadbf49e4cc53f1cb61
+jruby-bin-1.7.0.RC1.tar.gz=bdddcee3d126cddd9a85b5a066a7e25e
 libiconv-1.13.1.tar.gz=7ab33ebd26687c744a37264a330bbe9a
 ncurses.tar.gz=cce05daf61a64501ef6cd8da1f727ec6
 openssl-0.9.8k.tar.gz=e555c6d58d276aec7fdc53363e338ab3