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

[leigh123linux]

commit be4caa257af2200aef86bc1666a624012b44b379
Merge: 68314b5 5e838c1
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Nov 26 18:08:34 2013 +0000

    Merge branch 'master' into f20

 .gitignore                 |    1 +
 autostart.patch            |    4 +-
 cinnamon-nm-applet.desktop |  140 --------------------------------------------
 cinnamon.spec              |   23 +++-----
 restore_panel_bounce.patch |   33 ----------
 sources                    |    2 +-
 6 files changed, 13 insertions(+), 190 deletions(-)
---