# HG changeset patch
# User asaha
# Date 1412883289 25200
# Node ID c271515197807db2f0496945241f0b09885af99b
# Parent  dbae37f50c43453f7d6f22d96adc8b5b6cd1e90d# Parent  a2a922ccc00f29af625cbecde8e77643c60f147c
Merge

diff -r dbae37f50c43 -r c27151519780 .hgtags
--- a/.hgtags	Mon Oct 06 14:13:00 2014 -0700
+++ b/.hgtags	Thu Oct 09 12:34:49 2014 -0700
@@ -332,6 +332,8 @@
 6e0c19cd42d7c4d307bea26840ee831cbd14e2fc jdk8u25-b15
 7fa6fa7cc204de988e224c6f8f75e62128fa84cd jdk8u25-b16
 53ca196be1ae098466976c017b166d4ce180c36f jdk8u25-b17
+a4f0c6dd8f97d4dd89baf09463c748abea9b3ed7 jdk8u25-b18
+c4de614efd7affc001715aa5a7040620924ac44a jdk8u25-b31
 c4bd223559aad3d152968a09d56241175d82c561 jdk8u31-b00
 6b5e2c190f3023162a33b798e57a0d78e027c843 jdk8u31-b01
 8b4ea00b438d7f99ecd6a8345cb018d8a0379620 jdk8u31-b02