# HG changeset patch
# User lana
# Date 1414811921 25200
# Node ID c1d0d673b1ba51143588814e9b138e40bdfc9335
# Parent  b251d9b9079941bcf6fc326da840f08b4305ee2f# Parent  9f35f614847d07da260951f4e74910bf5f60de25
Merge

diff -r 9f35f614847d -r c1d0d673b1ba .hgtags
--- a/.hgtags	Fri Oct 31 12:05:56 2014 -0700
+++ b/.hgtags	Fri Oct 31 20:18:41 2014 -0700
@@ -548,3 +548,4 @@
 f10fe402dfb1543723b4b117a7cba3ea3d4159f1 hs25.40-b15
 99372b2fee0eb8b3452f47230e84aa6e97003184 jdk8u40-b11
 8b9ec2da541a74ac698560b6a2bc45fccb789919 hs25.40-b16
+6b93bf9ea3ea57ed0fe53cfedb2f9ab912c324e5 jdk8u40-b12