# HG changeset patch
# User amurillo
# Date 1424451939 0
# Node ID 34f0c0e9df2188def1dac7d9b0d5bd95dc2b4303
# Parent  e84a77e479662bce804882cfd147d0d8c34d1109# Parent  415762d044e48a64d37827a61ce50c068f2d04a8
Merge

diff -r e84a77e47966 -r 34f0c0e9df21 make/hotspot_version
--- a/make/hotspot_version	Fri Feb 20 15:37:20 2015 +0000
+++ b/make/hotspot_version	Fri Feb 20 17:05:39 2015 +0000
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=25
 HS_MINOR_VER=60
-HS_BUILD_NUMBER=04
+HS_BUILD_NUMBER=05
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8