# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1507491293 -3600
# Node ID 826dd24e5eeeb37e104fe3c3a96e28644837df13
# Parent  2e2e0db16b8ce8c427dea1d16d2159a906d309a9# Parent  7e9d5852c80208d3359ba26b43387c5bae73d5b9
Automated merge with ssh://hg.cryhavoc.org.uk/dottes

diff -r 7e9d5852c802 -r 826dd24e5eee .hgtags
--- a/.hgtags	Sun Oct 08 20:34:49 2017 +0100
+++ b/.hgtags	Sun Oct 08 20:34:53 2017 +0100
@@ -110,3 +110,4 @@
 de5bbf98b1c548ecb606de7c286b2f4c24798dbe build-default-275
 498f7b49cd5ad85d0838d602f0d3da527095356e build-default-276
 083d8fd4a7c32a5dd5cf0f81f5fb54dda1d7d717 build-default-277
+7da70e8900ab1e95ac8d32e318f58b287c9f82c1 build-default-278