commit 243cf35bc411073f300ffa6451dde5824000a72f Merge: 6c43eaa d6508ac Author: leigh123linux <leigh123linux at googlemail.com> Date: Fri Oct 18 17:46:04 2013 +0100 Merge branch 'master' into f20 cinnamon.spec | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---