From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 25 Feb 2010 14:28:21 +0000 (+0000)
Subject: Merge; also move moderators from master/
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~webstump/git?a=commitdiff_plain;ds=sidebyside;h=56801be17418e7872d29647f348af045e2a23f7f;p=modbot-ulm.git

Merge; also move moderators from master/
---

56801be17418e7872d29647f348af045e2a23f7f
diff --cc .gitignore
index 4da94c1,a3b3b06..c3e4d59
--- a/.gitignore
+++ b/.gitignore
@@@ -12,9 -12,4 +12,11 @@@
  /xlog/log/*/event.log
  /xlog/log/*/event.log.[0-9]
  /xlog/log/*/event.log.[0-9].gz
- /settings
 -/master/moderators
 +/crontab.part
 +/stump/etc/added-headers
 +/stump/etc/added-footer
 +/stump/etc/added-footer.new
 +/stump/etc/approval.key.txt
++
++/settings
++/moderators