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

[leigh123linux]

commit 70764b31179d32c44e32332bdce9d68fca510137
Merge: 4e91a50 b849aaa
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sat Jul 5 10:35:53 2014 +0100

    Merge branch 'master' into f20

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