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

[leigh123linux]

commit 3dd2eb83ba9fffea2c75948a8c23496dd9241031
Merge: d68d998 df1c130
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Oct 18 00:03:49 2013 +0100

    Merge branch 'master' into f20

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