# HG changeset patch
# User asaha
# Date 1437609728 25200
# Node ID c80e74eb5aaa6abe74c7cf110a41290317bc4efb
# Parent  29ef5ee31b3d6b3a1672b26015ea7b3906729818# Parent  a136449471fd13f7ecf15db5d012603d0f026cda
Merge

diff -r 29ef5ee31b3d -r c80e74eb5aaa .hgtags
--- a/.hgtags	Mon Jul 20 11:41:52 2015 -0700
+++ b/.hgtags	Wed Jul 22 17:02:08 2015 -0700
@@ -449,6 +449,7 @@
 d1febf79ce5ea41fb4b818ffd3589cf923e6de5f jdk8u60-b22
 7f88b5dc78cebc2c5ebb716938fd9a7632b052b2 jdk8u60-b23
 2af11e10da7dc24610551bbeed02c4ca3f4ae654 jdk8u60-b24
+8d152d1e45944616309886e730ffcbfb5c078d22 jdk8u60-b25
 779397f90251ea813cb44621dc27f780e5c20449 jdk8u52-b06
 e0ce6be9142ed1e2f0ce3ee13090ec01c6c44721 jdk8u52-b07
 779397f90251ea813cb44621dc27f780e5c20449 jdk8u65-b00