# HG changeset patch
# User lana
# Date 1386096399 28800
# Node ID c3343930c73c58a22c1d58719bb988aeb25a871f
# Parent  44ea3815e4144ef9a3d4b56161ebfd5df787abf0# Parent  b55a011cf8aef27e6ada94a6e0b5232a2a1701b5
Merge

diff -r 44ea3815e414 -r c3343930c73c .hgtags
--- a/.hgtags	Mon Nov 25 09:41:25 2013 -0800
+++ b/.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