Merge branch 'master' into distorted
authorMark Wooding <mdw@distorted.org.uk>
Fri, 22 Feb 2013 01:15:07 +0000 (01:15 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 22 Feb 2013 01:15:07 +0000 (01:15 +0000)
commit5831fea2bc58b7c163e4eb72c8532cba47aa34a2
tree2983fcdddc8c6a3a6f2f313fa801e4cdda610887
parentdcf95e8de28063ae669551509d16bbcdb0a58259
parent07b4b1190defd33efa5d807ecb3a412eb5cba71e
Merge branch 'master' into distorted

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

Conflicts:
etc/logrotate.conf
etc/logrotate.conf