# HG changeset patch
# User lana
# Date 1418333981 28800
# Node ID 57490e455c30535e0e5b5f40212cda1e01bf4351
# Parent  f25953cb4e181537a695c0533bc8263a25615a3a# Parent  fbd65124cdaa86f56167a9323b6610a43368e7d8
Merge

diff -r fbd65124cdaa -r 57490e455c30 .hgtags
--- a/.hgtags	Tue Dec 09 13:15:10 2014 -0800
+++ b/.hgtags	Thu Dec 11 13:39:41 2014 -0800
@@ -560,3 +560,4 @@
 6bf89bfe8185747a57193efb6cec1f17ccc80414 hs25.40-b21
 fc1f9b67fd8c5d5cd94ecc03569d93e7ce7fb574 jdk8u40-b17
 bc5a90a4db47f1c497d7894434c42325f595cd02 hs25.40-b22
+31d3306aad29e39929418ed43f28212a5f5306a3 jdk8u40-b18