[mate-session-manager/f18: 8/8] Merge branch 'f19' into f18

[Dan Mashal]

commit 5b92f1c5a6b3a8f209a8ee5cdc0763a7138d25ba
Merge: a5338d8 920a17e
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Thu May 23 20:58:03 2013 -0700

    Merge branch 'f19' into f18
    
    Conflicts:
    	.gitignore
    	mate-session-manager.spec
    	sources

 .gitignore                |    4 ++
 mate-session-manager.spec |   36 +++++++++++++++--------
 sources                   |    4 ++
 x-caja.patch              |   69 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 101 insertions(+), 12 deletions(-)
---
diff --cc .gitignore
index 13dc7ed,1050b8b..5bce24f
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,4 +1,8 @@@
  /mate-session-manager-1.4.0.tar.xz
  /mate-session-manager-1.5.0.tar.xz
  /mate-session-manager-1.5.1.tar.xz
++<<<<<<< HEAD
 +/mate-session-manager-1.5.2.tar.xz
++=======
+ /mate-session-manager-1.6.0.tar.xz
++>>>>>>> f19
diff --cc sources
index 70f88f1,b9e1354..199c145
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +75373b3d5d0d8f5f8f105f34de238a11  mate-session-manager-1.5.2.tar.xz
++=======
+ a8e1e83cabbf0ec3ec130c07f9038dcd  mate-session-manager-1.6.0.tar.xz
++>>>>>>> f19