# HG changeset patch
# User asaha
# Date 1433388508 25200
# Node ID e096acfc57361b10cd2f7054f9c21f1b639165f1
# Parent  4e82500d8465f9ed885454ae313ee964d4ff0ca6# Parent  a86893381fbb1c03ee743b691a7b7d6a90903eca
Merge

diff -r 4e82500d8465 -r e096acfc5736 .hgtags
--- a/.hgtags	Thu May 28 20:53:48 2015 -0700
+++ b/.hgtags	Wed Jun 03 20:28:28 2015 -0700
@@ -436,3 +436,4 @@
 040ce4bf5a41047116a0be643d791b9c76c412b3 jdk8u60-b15
 3cb841defba069c891f80fb03e2c71dad995ae6a jdk8u60-b16
 e882f38df713cac5cec98e18a013a81ce9fad0d3 jdk8u60-b17
+ee389d2cb785317ae0b8bb2c73e72daf9435824d jdk8u60-b18