# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1398695747 -3600
# Node ID 3c1be4306c18ac17ad0b5d1c7d3287f624806606
# Parent  219f23d3da348c2e29c070c21566c0c192bd9efb# Parent  b9a2da8c9203ef11ac7ea8e853e2d98c4fd85568
Automated merge with ssh://hg.cryhavoc.org.uk/dottes

diff -r 219f23d3da34 -r 3c1be4306c18 web/google1d7dcec83488a6af.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/google1d7dcec83488a6af.html	Mon Apr 28 15:35:47 2014 +0100
@@ -0,0 +1,1 @@
+google-site-verification: google1d7dcec83488a6af.html
\ No newline at end of file
diff -r 219f23d3da34 -r 3c1be4306c18 web/robots.txt
--- a/web/robots.txt	Mon Apr 28 15:34:42 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-# Stop indexing of this site.
-User-agent: *
-Disallow: /