Merge branch 'master' into stable-6.x

diff --git a/.gitignore b/.gitignore
index 0f48304d266f6722a14806ae84d4de3c3d81b315..4a7181ea968f25ca3946b5f7ee63dea7a21b4d5d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@ t
 
 core
 vgcore.*
+*.orig
+*.rej
 
 yarrg/*.o
 yarrg/t.*

diff --git a/yarrg/web/robots.txt b/yarrg/web/robots.txt
new file mode 100755 (executable)
index 0000000..38a5ff7
--- /dev/null
+++ b/yarrg/web/robots.txt
@@ -0,0 +1,11 @@
+<%flags>
+inherit => undef
+</%flags>
+<%perl>
+$r->content_type('text/plain');
+</%perl>
+User-Agent: *
+Disallow: /lookup
+Disallow: /test/code/lookup
+Disallow: /test/data/lookup
+Disallow: /test/both/lookup