# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1378064158 -3600
# Node ID 0f3b5866110323bee6db9fb3b8c977381b0c86a6
# Parent  7c3f90bf81df420b20fd9f56add49956b30a6fd8# Parent  00720ea5c47486deaccba70bd4599ae4613123c0
Automated merge with ssh://hg.cryhavoc.org.uk/dottes

diff -r 00720ea5c474 -r 0f3b58661103 .hgtags
--- a/.hgtags	Sun Sep 01 20:35:46 2013 +0100
+++ b/.hgtags	Sun Sep 01 20:35:58 2013 +0100
@@ -10,3 +10,4 @@
 e855ad8f39c05cd24752e9e200df0f2538334999 build-default-168
 cc8963317931603885c5aecda7d40b9c4bfea2e9 build-default-170
 8d574b900e3606f5d92ea1180a3e4011dfb4e8de build-default-171
+502fa2df300ec1ce8692d09a52fd64b87cee3cb4 build-default-172