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

[leigh123linux]

commit 10dbfd3b20e5c98367b8181d4243b4451d510a23
Merge: 23c34e0 285cc66
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Dec 4 00:04:13 2013 +0000

    Merge branch 'master' into f20

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