# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1478443271 0
# Node ID 6ec9229fd6fc56fca45b095ef949e1fbde2e2660
# Parent  df2f8a85fe7ba7f4adf8321d03b82ecbd36442d1# Parent  f66d8671497d9d45688ab427fc4b6d3e88999d3a
Automated merge with ssh://hg.cryhavoc.org.uk/dottes

diff -r f66d8671497d -r 6ec9229fd6fc .hgtags
--- a/.hgtags	Sun Nov 06 14:40:26 2016 +0000
+++ b/.hgtags	Sun Nov 06 14:41:11 2016 +0000
@@ -83,3 +83,4 @@
 51b75117ffd81c06f5e582e9227ba9d8391a1c44 build-default-246
 a6188ff0eff01c2b44982b9c64e7c4e384625efd build-default-247
 2fe68733ec1719d42ad82f12d1e8a8384666465b build-default-248
+5df2ceeb5726116812de5285a3ee49539410fa81 build-default-249