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

[leigh123linux]

commit 7dcd0ca7936914944f4c0e88909f653daa752636
Merge: 4512fc6 d5b9a4a
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Mon Dec 2 02:13:32 2013 +0000

    Merge branch 'master' into f19

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