From 68c45b82275d8fc0cffe629d9058f98f9f95f5ce Mon Sep 17 00:00:00 2001
From: Sergio Pascual <sergiopr@fis.ucm.es>
Date: Sep 24 2014 09:31:51 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/erfa


Conflicts:
	erfa.spec

---

diff --git a/erfa.spec b/erfa.spec
index 0020e53..0d75047 100644
--- a/erfa.spec
+++ b/erfa.spec
@@ -53,6 +53,9 @@ make check
 - New usptream version (1.1.1)
 - Using license macro
 
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild