[gupnp-tools: 2/2] fix merge

[Peter Robinson]

commit 63907ca93af2e4038a620685842f1b7b807f2592
Merge: 7e7a842 a6ed651
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Dec 12 12:12:02 2011 +0000

    fix merge

 gupnp-tools.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc gupnp-tools.spec
index 76d8b9e,47654c3..42d608c
--- a/gupnp-tools.spec
+++ b/gupnp-tools.spec
@@@ -67,17 -72,16 +67,20 @@@ desktop-file-install --vendor=gupnp 
  %{_datadir}/gupnp-tools/*.ui
  
  %changelog
 +* Mon Dec 12 2011 Peter Robinson <pbrobinson at fedoraproject.org> 0.8.4-1
 +- Update to 0.8.4
 +- http://ftp.gnome.org/pub/GNOME/sources/gupnp-tools/0.8/gupnp-tools-0.8.4.news
 +
+ * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.8.3-3
+ - Rebuild for new libpng
+ 
 -* Fri Jun 17 2011 Peter Robinson <pbrobinson at gmail.com> 0.8.3-2
 +* Fri Jun 17 2011 Peter Robinson <pbrobinson at fedoraproject.org> 0.8.3-2
  - rebuild for new gupnp/gssdp
  
 -* Fri Apr 15 2011 Peter Robinson <pbrobinson at gmail.com> 0.8.3-1
 +* Fri Apr 15 2011 Peter Robinson <pbrobinson at fedoraproject.org> 0.8.3-1
  - Update to 0.8.3
  
 -* Mon Apr 11 2011 Peter Robinson <pbrobinson at gmail.com> 0.8.2-1
 +* Mon Apr 11 2011 Peter Robinson <pbrobinson at fedoraproject.org> 0.8.2-1
  - Update to 0.8.2
  
  * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1-3