[gssdp: 2/2] fix merge

[Peter Robinson]

commit e02ac43d045bdc9454190a0f5751efc58809fe3f
Merge: 5f73288 7a8d8c4
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Feb 20 14:19:47 2013 +0000

    fix merge

 gssdp.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc gssdp.spec
index aa3ef29,3ef2758..b7fe745
--- a/gssdp.spec
+++ b/gssdp.spec
@@@ -95,10 -95,9 +95,13 @@@ find %{buildroot} -name '*.la' -exec r
  %{_datadir}/gtk-doc/html/%{name}
  
  %changelog
 +* Wed Feb 20 2013 Peter Robinson <pbrobinson at fedoraproject.org> 0.14.0
 +- 0.14.0 release
 +- http://ftp.gnome.org/pub/GNOME/sources/gssdp/0.14/gssdp-0.14.0.news
 +
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13.2-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Sat Dec  1 2012 Peter Robinson <pbrobinson at fedoraproject.org> 0.13.2-1
  - 0.13.2 release
  - http://ftp.gnome.org/pub/GNOME/sources/gssdp/0.13/gssdp-0.13.2.news