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)
commit07f0e777f015303f1921f4d7e582890e8268563a
treecd5c357ac6e733a1b726795960884fbfbc67b5cc
parentd4ce4207ce49701b70a60114a1777e75118c9aa4
parent4acb9a1a9b8ef9e51635de6545609d3a6455dd83
Merge remote-tracking branch 'mfischer/logrotate' into next

Conflicts:
config/rootfiles/common/logrotate
config/rootfiles/common/logrotate
lfs/logrotate