[gupnp-dlna: 2/2] fix merge

[Peter Robinson]

commit 7d885cf9a1e347fd1c8f1bab2e57d68de5b83a1f
Merge: 436d9e8 b313ec2
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Oct 20 10:13:06 2011 +0100

    fix merge

 gupnp-dlna.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --cc gupnp-dlna.spec
index ee0bd4a,39d740b..6142a20
--- a/gupnp-dlna.spec
+++ b/gupnp-dlna.spec
@@@ -81,11 -81,11 +81,15 @@@ find %{buildroot} -name '*.la' -exec r
  %{_datadir}/gtk-doc/html/%{name}
  
  %changelog
 +* Thu Oct 20 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 0.6.4-1
 +- 0.6.4 stable release
 +- http://ftp.gnome.org/pub/GNOME/sources/gupnp-dlna/0.6/gupnp-dlna-0.6.4.news
 +
+ * Fri Sep  2 2011 Zeeshan Ali <zeenix at redhat.com> - 0.6.3-1
+ - 0.6.3 stable release
+ - http://ftp.gnome.org/pub/GNOME/sources/gupnp-dlna/0.6/gupnp-dlna-0.6.3.news
+ 
 -* Sun Jul 17 2011 Peter Robinson <pbrobinson at gmail.com> - 0.6.2-1
 +* Sun Jul 17 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 0.6.2-1
  - 0.6.2 stable release
  - http://ftp.gnome.org/pub/GNOME/sources/gupnp-dlna/0.6/gupnp-dlna-0.6.2.news