Merge remote-tracking branch 'glotzi/monit' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Jan 2015 22:10:47 +0000 (23:10 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Jan 2015 22:10:47 +0000 (23:10 +0100)
1  2 
make.sh

diff --cc make.sh
Simple merge