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

[david hannequin]

commit eac82759747fc534ff6480f026262e36713010fd
Merge: 3fd365c 7d57440
Author: hvad <david.hannequin at gmail.com>
Date:   Fri Feb 13 19:36:55 2015 +0100

    Merge branch 'master' into epel7

 path.cfg     |  1 +
 shinken.spec | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)
---