Merge remote-tracking branch 'mfischer/logrotate' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Mar 2015 17:01:39 +0000 (18:01 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Mar 2015 17:01:39 +0000 (18:01 +0100)
Conflicts:
config/rootfiles/common/logrotate

1  2 
config/rootfiles/common/logrotate
lfs/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
diff --cc lfs/logrotate
Simple merge