[irma_configuration: 3/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/irma_configuration

[Patrick "鮳\'&*`" Uiterwijk]

commit 5c4c67c9d6acf26a88358250237c4c43e3ee8fb8
Merge: f961d3b bd9140f
Author: Patrick Uiterwijk <puiterwijk at redhat.com>
Date:   Wed Jul 2 20:48:00 2014 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/irma_configuration
    
    Conflicts:
    	irma_configuration.spec

 irma_configuration.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc irma_configuration.spec
index df37d0a,9f11cf4..32565f8
--- a/irma_configuration.spec
+++ b/irma_configuration.spec
@@@ -4,7 -4,7 +4,7 @@@
  
  Name:           irma_configuration
  Version:        0.1
--Release:        0.4.%{shortcommit}%{?dist}
++Release:        0.5.%{shortcommit}%{?dist}
  Summary:        IRMA Card configuration data
  
  License:        CC0
@@@ -37,12 -37,12 +37,15 @@@ rm -f %{buildroot}%{_datadir}/%{name}/{
  
  %files
  %doc README.md AUTHORS LICENSE
 -%attr(0644,root,root) %{_datadir}/%{name}
 +%attr(-,root,root) %{_datadir}/%{name}
  
  %changelog
- * Thu Jul 03 2014 Patrick Uiterwijk <puiterwijk at redhat.com> - 0.1-0.4.aeb8d68
++* Thu Jul 03 2014 Patrick Uiterwijk <puiterwijk at redhat.com> - 0.1-0.5.aeb8d68
 +- Fix permissions
 +
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-0.4.aeb8d68
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Fri Mar 14 2014 Patrick Uiterwijk (LOCAL) <puiterwijk at redhat.com> - 0.1-0.3.aeb8d68
  - Using %attr(0644, root, root)