# HG changeset patch
# User asaha
# Date 1433388518 25200
# Node ID 012ff7f7a97ddd9c8164977e4a02f35f29800d4b
# Parent  e607e1ed8b303c8b9713a71b7168947b6d7bfc48# Parent  5b422975b71def8c5a16a4f303c8fb8b108dc0cf
Merge

diff -r e607e1ed8b30 -r 012ff7f7a97d .hgtags
--- a/.hgtags	Thu May 28 20:54:10 2015 -0700
+++ b/.hgtags	Wed Jun 03 20:28:38 2015 -0700
@@ -434,3 +434,4 @@
 8c0018c9c533126cf3f7e912936f6e227bd1e96c jdk8u60-b15
 1c9eb173022b4b95ef6c93685b62b3039ccf8d92 jdk8u60-b16
 d6a80a0a3e9aca2b40f80709c9ce6c471b8902cf jdk8u60-b17
+53361b1cead8fc5ab1619a0b3baec8d4b411319d jdk8u60-b18