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

[leigh123linux]

commit cd8ee2b93ff3b02051897667e8bf2f1689c66aa6
Merge: 41c803c 80ae94f
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Sep 24 15:31:18 2013 +0100

    Merge branch 'master' into f20

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