Merge remote-tracking branch 'morlix/check_mk' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 26 Jul 2014 19:34:06 +0000 (21:34 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 26 Jul 2014 19:34:06 +0000 (21:34 +0200)
commit32e799902dce517f39cf1131a870bd544923b14f
tree31558a9def18910b772545c7b50c375c84216ea3
parente2d4f687dcd1e5e240f278d5c99d27fe75cd76bf
parent38ace2f3aedf619f6b5b54979ba2823bb77af73e
Merge remote-tracking branch 'morlix/check_mk' into next