# HG changeset patch
# User amurillo
# Date 1418409060 28800
# Node ID f8fc5cbe082ce0fb0c6c1dcd39493a16ed916353
# Parent  f25953cb4e181537a695c0533bc8263a25615a3a# Parent  c5e86c5cd22efbcf9aa63d7146787f591f5aef45
Merge

diff -r c5e86c5cd22e -r f8fc5cbe082c .hgtags
--- a/.hgtags	Fri Dec 12 08:48:56 2014 +0100
+++ b/.hgtags	Fri Dec 12 10:31:00 2014 -0800
@@ -560,3 +560,4 @@
 6bf89bfe8185747a57193efb6cec1f17ccc80414 hs25.40-b21
 fc1f9b67fd8c5d5cd94ecc03569d93e7ce7fb574 jdk8u40-b17
 bc5a90a4db47f1c497d7894434c42325f595cd02 hs25.40-b22
+31d3306aad29e39929418ed43f28212a5f5306a3 jdk8u40-b18