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

[leigh123linux]

commit 23c34e02e555122d15d65740ed2b2c8903640c9e
Merge: 6db1ec3 d5b9a4a
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Mon Dec 2 02:13:04 2013 +0000

    Merge branch 'master' into f20

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