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

[leigh123linux]

commit 9437bc9a3da6f3fd61fb3f51548d1357d289299d
Merge: 10dbfd3 89aa277
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sat Dec 7 20:57:05 2013 +0000

    Merge branch 'master' into f20

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