# HG changeset patch
# User lana
# Date 1386096394 28800
# Node ID 9e90215673be68a3e77a9e444e4232076373734d
# Parent  24847bd96465d1d7e0bda3e121fe7625dbabcbe3# Parent  06d512d44c314e5eec81ea5968138f60d89c2e44
Merge

diff -r 24847bd96465 -r 9e90215673be .hgtags
--- a/.hgtags	Mon Nov 25 09:27:10 2013 -0800
+++ b/.hgtags	Tue Dec 03 10:46:34 2013 -0800
@@ -239,3 +239,4 @@
 763ada2a1d8c5962bc8c3d297e57c562d2e95338 jdk8-b115
 cbfe5da942c63ef865cab4a7159e01eff7d7fcf5 jdk8-b116
 a4afb0a8d55ef75aef5b0d77b434070468fb89f8 jdk8-b117
+0a6db1aac998cdc88e52f9adb97d40ca5b0f1da6 jdk8-b118