# HG changeset patch
# User asaha
# Date 1412697168 25200
# Node ID 4f50cc615f4f1e3b2e43819ab8a36ee1b07f2b18
# Parent  05a3614ed5276e5db2a73cce918be04b1a2922fb# Parent  4f9e65387c21831d0ea5726641a302c2ce73a4cc
Merge

diff -r 05a3614ed527 -r 4f50cc615f4f .hgtags
--- a/.hgtags	Mon Oct 06 14:13:11 2014 -0700
+++ b/.hgtags	Tue Oct 07 08:52:48 2014 -0700
@@ -320,6 +320,7 @@
 71e8403a2f8279315419adf5f4e9d6b232b6835c jdk8u25-b15
 1500138ce513600457be6bfa10979ecce6515aa6 jdk8u25-b16
 4b9cc65dd24d398c4f921c0beccfb8caeaaaf584 jdk8u25-b17
+cdbf34dbef404b47805c8c85b11c65c2afaa6674 jdk8u25-b18
 9b692a6e5f22228f822973d35610d37cb9dd9693 jdk8u31-b00
 6bf53bb6c969678488b1c073d56dd55df1a0ea17 jdk8u31-b01
 809bf97d7e70dcb3873fcbc10f12f62580b1c11d jdk8u31-b02