[cinnamon/f19: 2/2] Merge branch 'epel7' into f19

[leigh123linux]

commit 4788d2e4aa1dfb3d59efef473d6157f0983b0fb3
Merge: 2a7eb7c cbf2e64
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Jun 11 23:41:07 2014 +0100

    Merge branch 'epel7' into f19

 cinnamon.spec                                  |   10 ++++++----
 polkit-cinnamon-authentication-agent-1.desktop |    2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
---