Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
authorDirk Wagner <dirk.wagner@ipfire.org>
Tue, 6 Jan 2015 14:51:29 +0000 (15:51 +0100)
committerDirk Wagner <dirk.wagner@ipfire.org>
Tue, 6 Jan 2015 14:51:29 +0000 (15:51 +0100)
commitf0dd06542596fa14cb0ef3bbaeb3ae16ee78c325
tree5b4a1402743f63c3c4a4b9de597466743422ae44
parentd5ea5e366c52830d4e54b89309340674fc518af2
parent5e7c87280ea736ff2811c8ee332c9049186ac43d
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit

Conflicts:
config/etc/logrotate.conf
config/rootfiles/common/armv5tel/initscripts
config/rootfiles/common/i586/initscripts
lfs/initscripts
make.sh