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

[david hannequin]

commit 0fbcd31430c7bbfffa03c34d46f208b4691b3e1e
Merge: ab9c516 95924c9
Author: hvad <david.hannequin at gmail.com>
Date:   Sat Feb 14 03:55:23 2015 +0100

    Merge branch 'master' into f20

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