[mate-session-manager/f18: 4/4] Merge branch 'master' into f18

[Wolfgang Ulbrich]

commit a4e10e3aca97ec75882f339ac148832326057c38
Merge: 3002237 f53666f
Author: raveit65 <chat-to-me at raveit.de>
Date:   Fri Jul 26 17:53:58 2013 +0200

    Merge branch 'master' into f18

 mate-session-manager-1.5.0-fix_schema.patch |   80 ---------------------------
 mate-session-manager.spec                   |   15 +++--
 2 files changed, 9 insertions(+), 86 deletions(-)
---