# HG changeset patch
# User lana
# Date 1386096487 28800
# Node ID ae827ec00b75d48644431a12fd7d471654768139
# Parent  3e0f1ef7ccccd76d25ce28a2f31c8a04ca2ff6ad# Parent  dc903a4271047ab84f97fce0914d048ec1a90436
Merge

diff -r 3e0f1ef7cccc -r ae827ec00b75 jdk/.hgtags
--- a/jdk/.hgtags	Wed Nov 27 10:47:53 2013 -0800
+++ b/jdk/.hgtags	Tue Dec 03 10:48:07 2013 -0800
@@ -239,3 +239,4 @@
 f82b730c798b6bf38946baaba8a7d80fd5efaa70 jdk8-b115
 0dc0067f3b8efb299a4c23f76ee26ea64df9e1d7 jdk8-b116
 fc4ac66aa657e09de5f8257c3174f240ed0cbaf7 jdk8-b117
+28ca338366ff2774ac9002f9f6eaff4101a3ea3b jdk8-b118