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

[leigh123linux]

commit 83be69a40f2e155818e7ebfc758cdd57a9cebe33
Merge: 92246f2 10bf629
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sat May 3 16:36:04 2014 +0100

    Merge branch 'master' into f20

 .gitignore    |    1 +
 cinnamon.spec |   17 ++++++-----------
 sources       |    2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)
---