# HG changeset patch
# User Greg Lewis <glewis@eyesbeyond.com>
# Date 1471719382 25200
# Node ID ffc7e7c4794c8f1a91fae1a85b23ae6b7f55eb8f
# Parent  5149d558060be690f922219fa1f31f33a1a617c3# Parent  548ba811d4c6e87d5a8774e2a49ebe019aeba866
Merge from main OpenJDK repository

diff -r 5149d558060b -r ffc7e7c4794c .hgtags
--- a/.hgtags	Sun May 01 16:42:36 2016 -0700
+++ b/.hgtags	Sat Aug 20 11:56:22 2016 -0700
@@ -607,3 +607,5 @@
 3c71abf7435352aee6e74ba2581274181ad3d17e jdk7u95-b00
 93a2788178e6ebebfbd30075f51ab35ac4f1b2a1 jdk7u99-b00
 5713b8d2db3f1fc0c9802fdaf30ca802cddf8f65 jdk7u101-b00
+e65eb66727550af75293996fc42e2c49c2002659 jdk7u111-b00
+a5002845bff276d1a8e4bdb4a0dcb972509f7d07 jdk7u111-b01