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

[leigh123linux]

commit 9a5787d0f65683f007e57f9aebd41533856ec060
Merge: 9082b07 3464b60
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Jan 15 08:57:39 2014 +0000

    Merge branch 'epel7' into f19

 cinnamon.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---