Module: check_mk
Branch: master
Commit: f50a9fcf13c24cf462c68655e186e492b448dbaf
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f50a9fcf13c24c…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Fri Apr 4 13:49:45 2014 +0200
manually resolved merge conflict in ChangeLog
---