# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1377905928 -3600
# Node ID 502fa2df300ec1ce8692d09a52fd64b87cee3cb4
# Parent  30a9bef6c3e1ab93900b0ac0cb81bf497b3412a8# Parent  e09ff88ab469e756c646458c39fc1e37f8d85bd8
Automated merge with ssh://hg.cryhavoc.org.uk/dottes

diff -r e09ff88ab469 -r 502fa2df300e .hgtags
--- a/.hgtags	Sat Aug 31 00:38:45 2013 +0100
+++ b/.hgtags	Sat Aug 31 00:38:48 2013 +0100
@@ -9,3 +9,4 @@
 53114cab95a2f3f67215a9950770d4f645e505b4 build-default-167
 e855ad8f39c05cd24752e9e200df0f2538334999 build-default-168
 cc8963317931603885c5aecda7d40b9c4bfea2e9 build-default-170
+8d574b900e3606f5d92ea1180a3e4011dfb4e8de build-default-171