From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 22 Feb 2013 01:15:07 +0000 (+0000)
Subject: Merge branch 'master' into distorted
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/mirror-admin/commitdiff_plain/5831fea2bc58b7c163e4eb72c8532cba47aa34a2?hp=5831fea2bc58b7c163e4eb72c8532cba47aa34a2

Merge branch 'master' into distorted

* master:
  etc/logrotate.conf: Actually rotate log files sometimes.

Conflicts:
	etc/logrotate.conf
---