[checkmk-commits] Check_MK Git: check_mk: resolved gitbug merge conflict

[git version control]

Module: check_mk
Branch: master
Commit: bc11e48e76b8690125fa86a1bced8f32ceaa08c8
URL:    http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc11e48e76b8690125fa86a1bced8f32ceaa08c8

Author: Andreas Boesl <ab at mathias-kettner.de>
Date:   Tue Oct  9 16:16:22 2012 +0200

resolved gitbug merge conflict

---