[cinnamon-session/f19: 2/2] Merge branch 'master' into f19

[leigh123linux]

commit d5950673ad1f83656845c03bffa39435f69fdbc4
Merge: ab78bfb 56393d8
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Oct 8 00:14:03 2013 +0100

    Merge branch 'master' into f19

 cinnamon-session.spec |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)
---