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

[leigh123linux]

commit fe8e76df70d7b8aa8356b16a829f98b8cff69a00
Merge: ab25008 b7fd0b3
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Nov 26 09:54:21 2014 +0000

    Merge branch 'master' into f20

 cinnamon.spec             |    6 +++++-
 remove_session_bits.patch |   11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletions(-)
---