# HG changeset patch
# User asaha
# Date 1402506050 25200
# Node ID 3d31955043b9f1807c9d695c7b5d604d11c132cf
# Parent  4cf4b8c9ea77b024be3091fb0f3d0529da1511d8# Parent  5a2fc5afd1a2d548cbb8ad016881e7f11d392090
Merge

diff -r 4cf4b8c9ea77 -r 3d31955043b9 .hgtags
--- a/.hgtags	Thu Jun 05 15:27:50 2014 -0700
+++ b/.hgtags	Wed Jun 11 10:00:50 2014 -0700
@@ -300,5 +300,6 @@
 8ef9f5f9b0c5f86f325c4aad3c6dc1ff9243ea43 jdk8u20-b15
 86741f3a4a381de18fbbfecd588660ca7a94c5ed jdk8u20-b16
 3ff7f413379f29e1937223902edf1fe2b90d7d60 jdk8u20-b17
+a3b85d6097c52cbff3e514ad6dc4f705fbaaa8bb jdk8u20-b18
 efc85d318f4697f40bdd1f3757677be97f1758d9 jdk8u25-b00
 a76779e1b0376650dfc29a1f3b14760f05e0fc6d jdk8u25-b01