[innotop/el6: 65/65] Fix merge

[Fabio Alessandro Locati]

commit 7148ed42b59f659ecc5af6f6d519ed2b7959f45a
Merge: ec2ed4c e7fb8f1
Author: Fabio Alessandro Locati <fabiolocati at gmail.com>
Date:   Sat Aug 23 09:31:27 2014 +0200

    Fix merge

 .gitignore                   |    2 +
 innotop-fix-MariaDB-10.patch |   99 ++++++++++++++++++++++++++++++++++++++++++
 innotop.spec                 |   67 ++++++++++++++++++++++++-----
 sources                      |    1 +
 4 files changed, 158 insertions(+), 11 deletions(-)
---
diff --cc innotop.spec
index e43e1a0,fd778d7..3c60a57
--- a/innotop.spec
+++ b/innotop.spec
@@@ -46,12 -60,37 +60,43 @@@ make tes
  %{_mandir}/man1/innotop.1*
  
  %changelog
+ * Thu Aug 21 2014 Fabio Alessandro Locati <fabiolocati at gmail.com> - 1.9.1-6
+ - Solving last pieces of mess
+ 
+ * Wed Aug 20 2014 Fabio Alessandro Locati <fabiolocati at gmail.com> - 1.9.1-5
+ - Fix bogous date in changelog
+ - Fix mixture of spaces and tabs
+ 
+ * Wed Aug 20 2014 Fabio Alessandro Locati <fabiolocati at gmail.com> - 1.9.1-4
+ - Fix previously bad applied patch
+ 
+ * Mon Aug 11 2014 Luis Bazan <lbazan at fedoraproject.org> - 1.9.1-3
+ - fix changelog
+ 
+ * Mon Aug 11 2014 Luis Bazan <lbazan at fedoraproject.org> - 1.9.1-2
+ - add patch fix BZ# 1128704
+ 
+ * Wed Jan 15 2014 Eduardo Echeverria <echevemaster at gmail.com> - 1.9.1-1
+ - Update to 1.9.1
+ 
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.0-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
+ * Wed Jul 24 2013 Petr Pisar <ppisar at redhat.com> - 1.9.0-4
+ - Perl 5.18 rebuild
+ 
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.0-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
+ * Fri Oct 05 2012 Luis Bazan <lbazan at fedoraproject.org> 1.9.0-2
+ - Add BuildRequires
+ 
 +* Fri Oct 05 2012 Eduardo Echeverria <echevemaster at fedoraproject.org> 1.9.0-3
 +- Add BuildRequires perl_Time_HiRes
 +
 +* Fri Oct 05 2012 Eduardo Echeverria <echevemaster at fedoraproject.org> 1.9.0-2
 +- Add BuildRequires
 +
  * Fri Sep 21 2012 Luis Bazan <lbazan at fedoraproject.org> 1.9.0-1
  - New Upstream version
  
diff --cc sources
index e2d09c8,76776bb..2a6faf4
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,2 @@@
 +a3e6c99f48b295da7090987a5f2ae166  innotop-1.9.0.tar.gz
+ 7979b7a074e43fe1f0d032034e234bac  innotop-1.9.1.tar.gz