[mate-file-manager] Revert "Merge branch 'master' of ssh://pkgs.fedoraproject.org/mate-file-manager"

[leigh123linux]

commit 0b1692efa850cc93f35ee1fd29ac82a15d7e4561
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Nov 20 21:31:38 2012 +0000

    Revert "Merge branch 'master' of ssh://pkgs.fedoraproject.org/mate-file-manager"
    
    This reverts commit 3a3e5175fb2dc05145f3ba97da1c8d7250f92077, reversing
    changes made to 89b4e4859059d0e5aa2b1baf375d7378cb4dcb32.

 .gitignore             |    3 -
 commit_rollup.patch    |26761 ------------------------------------------------
 mate-file-manager.spec |    5 +-
 3 files changed, 4 insertions(+), 26765 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index af8ae56..5ea85c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,5 @@
 <<<<<<< HEAD
 =======
 /mate-file-manager-1.5.0.tar.xz
-<<<<<<< HEAD
 /mate-file-manager-1.5.0-GIT.tar.gz
 >>>>>>> master
-=======
->>>>>>> 284cc694545498a77dfcaf83edf83a152f0f4a3f
diff --git a/mate-file-manager.spec b/mate-file-manager.spec
index 92cb523..6732f26 100644
--- a/mate-file-manager.spec
+++ b/mate-file-manager.spec
@@ -36,7 +36,7 @@ BuildRequires:	pkgconfig(gsettings-desktop-schemas)
 Requires:	%{name}-extensions%{?_isa} = %{version}-%{release}
 
 # Some changes to default config
-Patch0:		diff.patch
+Patch0:		crash_fix.patch
 
 #Patch1:	caja-rtl-fix.patch
 
@@ -190,6 +190,9 @@ fi
 
 
 %changelog
+* Tue Nov 20 2012 Dan Mashal <dan.mashal at fedorparoject.org> - 1.5.0-5
+- Emergency bugfix release
+
 * Sun Nov 19 2012 Dan Mashal <dan.mashal at fedoraproject.org> - 1.5.0-4
 - Fix caja crash on resolution change
 - Update configure flags, disable gtk doc