Merge remote-tracking branch 'glotzi/monit' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 4 Apr 2015 12:14:19 +0000 (14:14 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 4 Apr 2015 12:14:19 +0000 (14:14 +0200)
commit6b6730a95f8bb7a370203716d7ae568efae74707
tree6c01a07f62e5f849e68e4506ad1275483a821ad1
parentf94223119075377b14f6c25c573be533f3681013
parenta40a1e25f7d1e6ec648afd10c8873611d139bfd9
Merge remote-tracking branch 'glotzi/monit' into next