# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1378127520 -3600
# Node ID db656da32b2cee530291af5432e0807723283928
# Parent  0c941ac3f38651361eaafe1763bf13ce82dbf241# Parent  66e83b32ad905d0919f3283ac95117861889f971
Automated merge with ssh://hg.cryhavoc.org.uk/dottes

diff -r 66e83b32ad90 -r db656da32b2c .hgtags
--- a/.hgtags	Mon Sep 02 14:11:56 2013 +0100
+++ b/.hgtags	Mon Sep 02 14:12:00 2013 +0100
@@ -14,3 +14,4 @@
 0f3b5866110323bee6db9fb3b8c977381b0c86a6 build-default-173
 b855c35f1257d59fdd1846509c18fcb896bcbfd8 build-default-174
 f1c4abe4fc75cb9cc9cae3b596be558cc7406142 build-default-175
+a6a096bb279a73540fa9b20ac1d540ae41c480e9 build-default-176