[libinfinity: 4/4] Merge branch 'epel7'

[Till Maas]

commit 6c5a5e61857cbb745d0b408485caf2e69b08c414
Merge: 780e3a1 2186b4b
Author: Till Maas <opensource at till.name>
Date:   Wed Oct 1 21:40:22 2014 +0200

    Merge branch 'epel7'
    
    Conflicts:
    	libinfinity.spec

 .gitignore       |    6 ++++
 libinfinity.spec |   83 ++++++++++++++++++++++++++++++++++++++++-------------
 sources          |    5 ++-
 3 files changed, 71 insertions(+), 23 deletions(-)
---
diff --cc libinfinity.spec
index 7c1c748,ea3e782..e160e3a
--- a/libinfinity.spec
+++ b/libinfinity.spec
@@@ -185,12 -220,12 +220,18 @@@ rm -rf %{buildroot
  
  
  %changelog
+ * Sat Sep 20 2014 Till Maas <opensource at till.name> - 0.6.2-1
+ - Update to new release
+ 
+ * Fri Aug 29 2014 Till Maas <opensource at till.name> - 0.6.1-1
+ - Update to new release
+ 
 +* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.5-3
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 +
 +* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.5-2
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 +
  * Mon Jan 13 2014 Till Maas <opensource at till.name> - 0.5.5-1
  - Update to new release