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

[leigh123linux]

commit 6f7b03ece3336e4ceb79bf8948eb237b108738e6
Merge: 243cf35 3396881
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Oct 24 14:05:06 2013 +0100

    Merge branch 'master' into f20

 .gitignore                   |    1 +
 cinnamon-settings-apps.patch |    6 +-
 cinnamon.spec                |    9 +-
 git_rollup_fixes.patch       |  267 ------------------------------------------
 sources                      |    2 +-
 5 files changed, 11 insertions(+), 274 deletions(-)
---