# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1524757533 -3600
# Node ID bfaa32127c76a8b4e5d671921f97f51fe2fa77de
# Parent  1158f22940d686ced1e8faa6ef1eb1fca1727c79# Parent  1cdafbd22363886f1c62617d7248d2d7366f4835
Merge with upstream.

diff -r 1158f22940d6 -r bfaa32127c76 .hgtags
--- a/.hgtags	Thu Apr 26 16:43:40 2018 +0100
+++ b/.hgtags	Thu Apr 26 16:45:33 2018 +0100
@@ -130,3 +130,4 @@
 6a851e9965ce67bdb1d6fff9d082abbfe71bc418 build-default-296
 28dce4eba04b30dd59c0f0ad244a5eca64f5369e build-default-297
 63134d08a7ca675aa779c20d16fee5849fe6afd1 build-default-298
+c979a83fdd2605547303855b7db168fef46c5547 build-default-299