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

[leigh123linux]

commit 5d2f1199025c8cdb872b3866c7ae3db8ad475244
Merge: df57083 6e94b4b
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sun Nov 10 13:22:09 2013 +0000

    Merge branch 'master' into f19

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