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

[leigh123linux]

commit 37b5d24b62b61ceafca2689dba07c0063a4fa671
Merge: d0cdc2e 5821158
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue May 20 20:44:04 2014 +0100

    Merge branch 'master' into f20

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