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

[leigh123linux]

commit 7bc2fc4bbc67ecb5b2599576b57e809f65c7a8ad
Merge: 925338d 607ca93
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Oct 10 22:32:11 2013 +0100

    Merge branch 'master' into f20

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