From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 16 Mar 2015 17:01:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'mfischer/logrotate' into next
X-Git-Tag: v2.17-core91~154^2~3^2~2
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=07f0e777f015303f1921f4d7e582890e8268563a

Merge remote-tracking branch 'mfischer/logrotate' into next

Conflicts:
	config/rootfiles/common/logrotate
---

07f0e777f015303f1921f4d7e582890e8268563a
diff --cc config/rootfiles/common/logrotate
index 7f3e709ead,248a624ba9..5800a04863
--- a/config/rootfiles/common/logrotate
+++ b/config/rootfiles/common/logrotate
@@@ -1,5 -1,4 +1,6 @@@
 +#etc/logrotate.d
 +etc/logrotate.d/.empty
+ #usr/man/man5/logrotate.5
  #usr/man/man8/logrotate.8
  usr/sbin/logrotate
  var/lib/logrotate.status