# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1478303043 0
# Node ID b20beaebc06bc8e05270b51cc5db9a1aaa42af68
# Parent  22f3e6a6e7f6bf58a5a628524e7b77ce4251c9f7# Parent  ac7d039116c410fa59da6dc0ca9c30c68411616b
Automated merge with ssh://hg.cryhavoc.org.uk/dottes

diff -r ac7d039116c4 -r b20beaebc06b .hgtags
--- a/.hgtags	Fri Nov 04 23:34:41 2016 +0000
+++ b/.hgtags	Fri Nov 04 23:44:03 2016 +0000
@@ -78,3 +78,4 @@
 76aa6580b277ab72e02d419a4ee8f18807aa93d7 build-default-241
 fceafdb462a8b81450770ce32ce2240dc7a1eee8 build-default-242
 3b8a457ea3c98cd41a0556a7c659fb248dd5bb65 build-default-243
+d5357ee6b4b2f71c66a1ffd814c555a1b97d4334 build-default-244