From cf29488c587334874cf491a01a1f74ba3ac7de45 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Mon, 30 Sep 2013 13:46:59 -0400
Subject: Merge branch 'new'.

---
(limited to '.htaccess')

diff --git a/.htaccess b/.htaccess
deleted file mode 100644
index 82f062b..0000000
--- a/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-Options +Includes
-XBitHack on
--
cgit v0.9.1