# HG changeset patch
# User lana
# Date 1386096408 28800
# Node ID 379fc7609beb7a3d85ebc0cc21a8a51c60d3c7d3
# Parent  e648df60c8a24dbd76de321b424e850a46a26dba# Parent  5029f982dfae6bedb95f067b8546dfccf13a37ae
Merge

diff -r e648df60c8a2 -r 379fc7609beb .hgtags
--- a/.hgtags	Mon Nov 25 09:27:14 2013 -0800
+++ b/.hgtags	Tue Dec 03 10:46:48 2013 -0800
@@ -239,3 +239,4 @@
 8d07115924b7d703a5048adb24e8aba751442f13 jdk8-b115
 5fdc4465208933ba704825b2b05e1afd062235fb jdk8-b116
 e53d1ee4d2ae898f1cf58688d45a5afe7c482173 jdk8-b117
+d6820a414f182a011a53a29a52370c696cd58dab jdk8-b118