[catdoc/el5: 7/7] Merge remote branch 'origin/el6' into el5

[Robert Scheck]

commit 1ba5a19e05ae4d035d7505f44f535f1461893159
Merge: a099f26 338e162
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Oct 12 00:11:00 2014 +0200

    Merge remote branch 'origin/el6' into el5
    
    Conflicts:
    	catdoc.spec

 catdoc.spec |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)
---
diff --cc catdoc.spec
index a638f3c,dc05a92..ac0ccd1
--- a/catdoc.spec
+++ b/catdoc.spec
@@@ -60,9 -59,27 +60,18 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
- * Fri Nov 02 2012 Adel Gadllah <adel.gadllah at gmail.com> - 0.94.2-4
- - Fix buffer overflow vulnerability; RH#872390 / RH#872392
+ * Fri Nov 02 2012 Adel Gadllah <adel.gadllah at gmail.com> - 0.94.2-10
+ - Fix buffer overflow vulnerability; RH#872390 / RH#872391
+ 
+ * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.94.2-9
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
+ * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.94.2-8
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.94.2-7
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
  
 -* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.94.2-6
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 -
 -* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.94.2-5
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 -
 -* Fri Feb 08 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.94.2-4
 -- Rebuild for gcc-4.3
 -
  * Sun Nov 11 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.94.2-3
  - Preserve timestamps