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

[leigh123linux]

commit b52f80691a45748ef44de0e0df5e8122a5e7bb0d
Merge: 89528b4 8bc5f5e
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Jan 22 18:21:30 2014 +0000

    Merge branch 'master' into f20

 cinnamon.spec |  275 +++------------------------------------------------------
 1 files changed, 13 insertions(+), 262 deletions(-)
---