[rygel/f21] fix merge

[Peter Robinson]

commit d94220cd5b508124c857c006cce1f9a0d586f9f6
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Oct 14 14:45:36 2014 +0100

    fix merge

 rygel.spec |    9 ++++++---
 sources    |    2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/rygel.spec b/rygel.spec
index 69ee06e..3c0c632 100644
--- a/rygel.spec
+++ b/rygel.spec
@@ -1,12 +1,12 @@
 Name:          rygel
-Version:       0.23.3.1
-Release:       2%{?dist}
+Version:       0.24.0
+Release:       1%{?dist}
 Summary:       A collection of UPnP/DLNA services
 
 Group:         Applications/Multimedia
 License:       LGPLv2+
 URL:           http://live.gnome.org/Rygel
-Source0:       ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.23/%{name}-%{version}.tar.xz
+Source0:       ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.24/%{name}-%{version}.tar.xz
 
 BuildRequires: dbus-glib-devel
 BuildRequires: desktop-file-utils
@@ -136,6 +136,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/vala/vapi/rygel*.vapi
 
 %changelog
+* Tue Sep 23 2014 Peter Robinson <pbrobinson at fedoraproject.org> 0.24.0-1
+- Update to 0.24.0
+
 * Tue Sep 02 2014 Pádraig Brady <pbrady at redhat.com> - 0.23.3.1-2
 - rebuild for libunistring soname bump
 
diff --git a/sources b/sources
index 38a1e2d..e6b9867 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7c0fc78005000dd45585ee0268ef240d  rygel-0.23.3.1.tar.xz
+03e56d96eea310623163fc17e5091549  rygel-0.24.0.tar.xz