# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1478593319 0
# Node ID 061b8a3f5e70ba033c13797c62390f636736cd06
# Parent  ce1b6fb2696410a53357407b67ae6887e7f1d2d3# Parent  2d436a8e3dd28b235ac56cedcb1c10f5ba89d5c6
Automated merge with ssh://hg.cryhavoc.org.uk/dottes

diff -r 2d436a8e3dd2 -r 061b8a3f5e70 .hgtags
--- a/.hgtags	Tue Nov 08 08:21:41 2016 +0000
+++ b/.hgtags	Tue Nov 08 08:21:59 2016 +0000
@@ -87,3 +87,4 @@
 6ec9229fd6fc56fca45b095ef949e1fbde2e2660 build-default-250
 7a64aeaaa29451eadb46294f55e7988ef9e3a2d4 build-default-251
 776a455efe47e59fdaa194c27b262d014f58fa3e build-default-252
+df9c60f6fbd742479bc974eb7937e13af5ba655a build-default-253