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

[leigh123linux]

commit dd28181401e674e4785771e14d135ca8d0d79d28
Merge: fe7a572 2e3fe32
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sun Dec 22 11:20:45 2013 +0000

    Merge branch 'master' into f19

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