[mate-session-manager/f17: 3/3] Merge branch 'master' into f17

[Wolfgang Ulbrich]

commit 820bef55da3c407614f770e2cc567704abf94f3a
Merge: 6692831 f53666f
Author: raveit65 <chat-to-me at raveit.de>
Date:   Fri Jul 26 17:55:47 2013 +0200

    Merge branch 'master' into f17

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