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

[david hannequin]

commit 7659fcd49521918ca1c12f52fd7e02545311134c
Merge: 690b3e6 95924c9
Author: hvad <david.hannequin at gmail.com>
Date:   Sat Feb 14 05:04:03 2015 +0100

    Merge branch 'master' into el6

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