[cinnamon-settings-daemon/f19: 2/2] fix merge

Mon Sep 30 14:16:24 UTC 2013

commit 5f2cc3f5d5355229d6200a31e3bd8bbf979fcc90
Merge: 73da23c 89dcfa6
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Mon Sep 30 15:15:59 2013 +0100

    fix merge

 .gitignore                    |    1 +
 cinnamon-settings-daemon.spec |   12 +++++++-----
 sources                       |    2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)
---