[rygel/f21] fix merge

[Peter Robinson]

commit d7bb0b53fbafc34226e4d1a7bbf8262f360cb817
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Oct 14 14:43:38 2014 +0100

    fix merge

 rygel.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/rygel.spec b/rygel.spec
index bb46453..8fd877e 100644
--- a/rygel.spec
+++ b/rygel.spec
@@ -1,6 +1,6 @@
 Name:          rygel
 Version:       0.23.2
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       A collection of UPnP/DLNA services
 
 Group:         Applications/Multimedia
@@ -139,8 +139,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Tue Aug 19 2014 Kalev Lember <kalevlember at gmail.com> - 0.23.3.1-1
 - Update to 0.23.3.1
 
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.23.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+* Mon Jul 28 2014 Kalev Lember <kalevlember at gmail.com> - 0.23.2-3
+- Rebuilt once more for tracker
+
+* Mon Jul 28 2014 Peter Robinson <pbrobinson at fedoraproject.org> 0.23.2-2
+- rebuild (tracker)
 
 * Wed Jul 23 2014 Peter Robinson <pbrobinson at fedoraproject.org> 0.23.2-1
 - Update to 0.23.2