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

[leigh123linux]

commit af3f39960371671eebf27fd50a8cac9559500731
Merge: 1b1d4c6 36b5bc6
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Jun 3 12:01:26 2014 +0100

    Merge branch 'master' into f20

 cinnamon.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---