# HG changeset patch
# User lana
# Date 1431659614 25200
# Node ID 75b0573e0a5db532d6e63d0412594c51193f4ca2
# Parent  74ff9caddc22b45e1f3cb13adb79124ba9de6c95# Parent  2cf987c37b5ea2fcf0219b01801cebffdc6ba480
Merge

diff -r 2cf987c37b5e -r 75b0573e0a5d .hgtags
--- a/.hgtags	Tue May 12 19:52:19 2015 +0200
+++ b/.hgtags	Thu May 14 20:13:34 2015 -0700
@@ -640,3 +640,4 @@
 1f0d760ccac1ff82a03a9b7d6bd5c697ef0a7c4a hs25.60-b14
 c9f8b7319d0a5ab07310cf53507642a8fd91589b jdk8u60-b14
 4187dc92e90b16b4097627b8af4f5e6e63f3b497 hs25.60-b15
+b99f1bf208f385277b03a985d35b6614b4095f3e jdk8u60-b15