[check-mk/el5: 8/8] Merge from master

[averi]

commit e91ad935124cb153ee74e9a63ed2b919173d14ce
Merge: ce4c054 8cd4712
Author: Andrea Veri <av at gnome.org>
Date:   Tue May 27 22:50:33 2014 +0200

    Merge from master

 check-mk.spec |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)
---