# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1508011377 -3600
# Node ID 33b4d07c59071d318f19f9d7993719ac0c4ca9e5
# Parent  fe789453007251c52494e80ab2e564eb4a6cbefe# Parent  e605fccf6e331061e22235c19b1dc3df34044265
Merge with upstream.

diff -r fe7894530072 -r 33b4d07c5907 .hgtags
--- a/.hgtags	Sat Oct 14 20:59:05 2017 +0100
+++ b/.hgtags	Sat Oct 14 21:02:57 2017 +0100
@@ -121,3 +121,4 @@
 34c7947b454284c14562e7a335c4c2a015e7956c build-default-286
 9a6c27f6d13dd6ea5e5b74e605c29b5e5bd24f62 build-default-287
 7d975b619963ec3d2e394cf11b393aadaed40518 build-default-288
+37a436edfedd640b37362a4c9aeb59e101aeb90b build-default-289