# HG changeset patch
# User amurillo
# Date 1402694262 25200
# Node ID 3e1cec358ab95ef985f821219104141b9ffda83f
# Parent  d80197f0d9d437125a13652cf4257d87f7253fde# Parent  4077c61b03a0022d6b5dd5ec73bb99b72e52c6ae
Merge

diff -r 4077c61b03a0 -r 3e1cec358ab9 .hgtags
--- a/.hgtags	Thu Jun 12 10:15:43 2014 -0700
+++ b/.hgtags	Fri Jun 13 14:17:42 2014 -0700
@@ -472,3 +472,4 @@
 ee8b934668694dba5dc0ac039f8d56e52499c0f9 hs25.20-b17
 8ea4732884ccd5586f0afe9478b80add90231455 jdk8u20-b17
 b685b4e870b159ea5731984199d275879d427038 hs25.20-b18
+11159d7ec80462a422e39c9b3a39ae932923622d jdk8u20-b18