# HG changeset patch
# User asaha
# Date 1402505776 25200
# Node ID d3d5604ea0dea3812e87ba76ac199d0a8be6f49f
# Parent  1e657b9023928b854e6b83ac3113002d8a81b231# Parent  e8986a664f47095c960fabc21949ca5a5ebe9913
Merge

diff -r 1e657b902392 -r d3d5604ea0de .hgtags
--- a/.hgtags	Tue Jun 10 14:52:20 2014 -0700
+++ b/.hgtags	Wed Jun 11 09:56:16 2014 -0700
@@ -484,5 +484,6 @@
 ee8b934668694dba5dc0ac039f8d56e52499c0f9 hs25.20-b17
 8ea4732884ccd5586f0afe9478b80add90231455 jdk8u20-b17
 b685b4e870b159ea5731984199d275879d427038 hs25.20-b18
+11159d7ec80462a422e39c9b3a39ae932923622d jdk8u20-b18
 a4d44dfb7d30eea54bc172e4429a655454ae0bbf jdk8u25-b00
 9a2152fbd929b0d8b2f5c326a5526214ae71731a jdk8u25-b01