# HG changeset patch # User amurillo # Date 1433483864 25200 # Node ID b852350a2bc6d5f43006e2be53fb74d148290708 # Parent 72fa632cb8fb016f778d882e38a1532695f11561# Parent afc7b3416dc6cebf641a9ba0a2f24f414f668799 Merge diff -r afc7b3416dc6 -r b852350a2bc6 .hgtags --- a/.hgtags Tue Jun 02 10:09:08 2015 -0400 +++ b/.hgtags Thu Jun 04 22:57:44 2015 -0700 @@ -646,3 +646,4 @@ 5efc25c367164b6856554b0d625f3c422fdf9558 hs25.60-b17 c26d09f1065cd26bd8b926efc5d3938b71e09eb5 jdk8u60-b17 624f4cc05e7e95dd2103f343c54d7bdea6a81919 hs25.60-b18 +3fa5c654c143fe309e5ddda92adc5fb132365bcf jdk8u60-b18