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

[leigh123linux]

commit 4e91a504e1b3eb3c1108cd25e2c1700511ca87f1
Merge: 79d0f35 28a787f
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sat Jul 5 10:34:36 2014 +0100

    Merge branch 'master' into f20

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