# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1478439637 0
# Node ID 5df2ceeb5726116812de5285a3ee49539410fa81
# Parent  031dfc0af0e881571119d25f15b3b4cb79f50ade# Parent  dfeb781e5196f700b5263af841e19ce54111a640
Automated merge with ssh://hg.cryhavoc.org.uk/dottes

diff -r dfeb781e5196 -r 5df2ceeb5726 .hgtags
--- a/.hgtags	Sun Nov 06 13:40:32 2016 +0000
+++ b/.hgtags	Sun Nov 06 13:40:37 2016 +0000
@@ -82,3 +82,4 @@
 b20beaebc06bc8e05270b51cc5db9a1aaa42af68 build-default-245
 51b75117ffd81c06f5e582e9227ba9d8391a1c44 build-default-246
 a6188ff0eff01c2b44982b9c64e7c4e384625efd build-default-247
+2fe68733ec1719d42ad82f12d1e8a8384666465b build-default-248