# HG changeset patch
# User Greg Lewis <glewis@eyesbeyond.com>
# Date 1471719381 25200
# Node ID 27026a9ff780ad08beba82fc2f5204334c047951
# Parent  ff56fdd2ec5469af52f436de977a220149f8d94d# Parent  29919af594f46f158604db87edbd538a3890884a
Merge from main OpenJDK repository

diff -r ff56fdd2ec54 -r 27026a9ff780 .hgtags
--- a/.hgtags	Sun May 01 16:42:25 2016 -0700
+++ b/.hgtags	Sat Aug 20 11:56:21 2016 -0700
@@ -607,3 +607,5 @@
 3427b35ce5a1a0143b4aedf3f5e0a1953ad7fd7f jdk7u95-b00
 e0764f20b2894c5de39f1e235171d42d5f2703eb jdk7u99-b00
 36ee37eedf25da13abde1c0b8974fb3b95c59c7c jdk7u101-b00
+8fd4ada6c5d5c3f71cc52cc2af97c971a58c6b53 jdk7u111-b00
+18074c212a8997055baa9aca9e9ae0dbbe90e1f4 jdk7u111-b01