[ark/f18: 9/9] Merge branch 'master' into f18

[Than Ngo]

commit 02d879254e8bc7b00cf809613daaa8cbd54ca183
Merge: 0f57757 96eb51a
Author: Than Ngo <than at redhat.com>
Date:   Mon Mar 4 13:12:07 2013 +0100

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	ark.spec
    	sources

 .gitignore                                       |    7 +--
 ark-4.9.97-improve_subfolder_autodetection.patch |   80 ++++++++++++++++++++++
 ark-4.9.97-r107635.patch                         |   11 +++
 ark.spec                                         |   35 ++++++++-
 sources                                          |    2 +-
 5 files changed, 124 insertions(+), 11 deletions(-)
---
diff --cc ark.spec
index f81a6e9,f4e51a9..53c1321
--- a/ark.spec
+++ b/ark.spec
@@@ -122,9 -128,33 +128,30 @@@ f
  
  
  %changelog
- * Sat Dec 29 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.9.5-1
- - 4.9.5
+ * Sat Mar 02 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.10.1-1
+ - 4.10.1
+ 
+ * Fri Feb 01 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.10.0-1
+ - 4.10.0
+ 
+ * Tue Jan 22 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.9.98-1
+ - 4.9.98
+ - respin reviewboard#107634 patch
+ 
+ * Thu Jan 17 2013 Tomas Bzatek <tbzatek at redhat.com> - 4.9.97-3
+ - Rebuilt for new libarchive
+ 
+ * Sat Jan 05 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.9.97-2
+ - Ark needs to know about application/x-source-rpm (#885316)
+ - Improve subfolder autodetection (kde review 107634)
+ - Don't delete the KPart in the MainWindow destructor (kde review 107635)
+ 
+ * Fri Jan 04 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.9.97-1
+ - 4.9.97
+ 
+ * Thu Dec 20 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.9.95-1
+ - 4.9.95
  
 -* Tue Dec 04 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.9.90-1
 -- 4.9.90
 -
  * Mon Dec 03 2012 Than Ngo <than at redhat.com> - 4.9.4-1
  - 4.9.4