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

[leigh123linux]

commit 92246f2c56d0fd316e6c54377cd7babd1c7d97dd
Merge: 138f469 955fc8e
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri May 2 10:24:49 2014 +0100

    Merge branch 'master' into f20

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