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

[leigh123linux]

commit d68d998686fdef8b8fef83ebc372609c39a50beb
Merge: e721cd5 c34d9c5
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Oct 17 22:17:37 2013 +0100

    Merge branch 'master' into f20

 autostart_nemo.patch       |    4 +-
 cinnamon-nm-applet.desktop |  140 ++++++++++++++++++++++++++++++++++++++++++++
 cinnamon.spec              |    9 +++-
 3 files changed, 150 insertions(+), 3 deletions(-)
---