[rasdaemon/f21: 5/5] fix merge

[Peter Robinson]

commit 257b55d8c7db5caab410019cb7ca4d95eef92f4b
Merge: 9e53c5e fadf8d6
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Sep 16 13:48:56 2014 +0100

    fix merge

 rasdaemon.spec |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)
---