# HG changeset patch
# User lana
# Date 1386096399 28800
# Node ID a529e9d7d40e1c37b84106c64c93d1b184ea3977
# Parent  10994f484e8472ec79528724c40d0a2d51aa59eb# Parent  e701c9251f67bf0cb25b2e9b89b2e429ad419d69
Merge

diff -r 10994f484e84 -r a529e9d7d40e nashorn/.hgtags
--- a/nashorn/.hgtags	Mon Nov 25 09:41:25 2013 -0800
+++ b/nashorn/.hgtags	Tue Dec 03 10:46:39 2013 -0800
@@ -227,3 +227,4 @@
 f0d3ac2474ee755b1180ec71bcdfa190845b17eb jdk8-b115
 0fb1a427fbf6e04c77cebbbf99b6631c664ed793 jdk8-b116
 1db3d4e4d18913e853d7bebf86816e87fda00a71 jdk8-b117
+8d014b039b44c23fa520ce20c2c27f7aa91441e9 jdk8-b118