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

[leigh123linux]

commit 89528b46a2d92459422f75568f91f7582a69048f
Merge: 23933f5 3464b60
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Jan 15 08:57:01 2014 +0000

    Merge branch 'epel7' into f20

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