# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1476632838 -3600
# Node ID b639b019b19e4143181e84699c76dbd050c0d58c
# Parent  c8b42d9b9224b45cbdaeeefc5574c1bb3934561d# Parent  1fd090c06bb1c2cbdc286a502f611c19b45b88bd
Automated merge with ssh://hg.cryhavoc.org.uk/dottes

diff -r 1fd090c06bb1 -r b639b019b19e .hgtags
--- a/.hgtags	Sun Oct 16 12:32:35 2016 +0100
+++ b/.hgtags	Sun Oct 16 16:47:18 2016 +0100
@@ -71,3 +71,4 @@
 e2eff99671a516cbe1803f9ffa43685ab5136336 build-default-234
 c6568aedca9e81e565b888c34d51c45043164b3d build-default-235
 726df98abe8876386e380f5564d21e2c0f5bbdef build-default-236
+a44de27fd0f80b148daae2c9880f6c027f35e36b build-default-237