[shinken/epel7: 2/2] Merge branch 'master' into epel7

[david hannequin]

commit d6d4736410347248f775c106dad274b758f461f6
Merge: ee44dea 95924c9
Author: hvad <david.hannequin at gmail.com>
Date:   Sat Feb 14 05:09:54 2015 +0100

    Merge branch 'master' into epel7

 shinken.spec | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
---