# HG changeset patch
# User amurillo
# Date 1398981420 25200
# Node ID 798f5b02be897151fdad44d695446088b1cca6b1
# Parent  47951595af60460a479b8574622375bfbf5c8ed2# Parent  7150b16fda528d6c3f4d0768bd9456e67b8e604f
Merge

diff -r 7150b16fda52 -r 798f5b02be89 .hgtags
--- a/.hgtags	Mon Apr 14 08:24:28 2014 +0200
+++ b/.hgtags	Thu May 01 14:57:00 2014 -0700
@@ -460,3 +460,4 @@
 70dc2c030c69470a5d9099b7f54e4cfef89276fd jdk8u20-b11
 b6a2ba7d3ea7259a76c8ff1ec22fac9094494c1c hs25.20-b11
 3c291bc2aa7c58efb1219701f38c41731609e595 hs25.20-b12
+18ae0dac7620474547aa1721bc3fd748af07b8b5 jdk8u20-b12