# HG changeset patch # User lana # Date 1422659671 28800 # Node ID fa4e797f61e6dda1a60e06944018213bff2a1b76 # Parent fcae47992523f19e0c51f0d39ab64c1c9c982098# Parent b9c06f87e47675d4fe94432dd08726c6b9e0490d Merge diff -r b9c06f87e476 -r fa4e797f61e6 .hgtags --- a/.hgtags Tue Jan 13 16:09:52 2015 +0100 +++ b/.hgtags Fri Jan 30 15:14:31 2015 -0800 @@ -585,3 +585,4 @@ 25ec4a67433744bbe3406e5069e7fd1876ebbf2f jdk8u40-b21 0f0cb4eeab2d871274f4ffdcd6017d2fdfa89238 hs25.40-b25 0ee548a1cda08c884eccd563e2d5fdb6ee769b5a jdk8u40-b22 +0e67683b700174eab71ea205d1cfa4f1cf4523ba jdk8u40-b23