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

[leigh123linux]

commit 6c43eaa5c931321d5980e1430ff06bf1cafda66d
Merge: 3dd2eb8 ab915e5
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Oct 18 17:33:26 2013 +0100

    Merge branch 'master' into f20

 .gitignore           |    1 +
 autostart.patch      |   18 ++++++++++++++++++
 autostart_nemo.patch |   18 ------------------
 cinnamon.spec        |   13 +++++++------
 sources              |    2 +-
 5 files changed, 27 insertions(+), 25 deletions(-)
---