[wget/f20: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/wget

[Tomas Hozza]

commit 1d5343afcfc959bab43d533b17693685ca72427f
Merge: f987fcc 2572b45
Author: Tomas Hozza <thozza at redhat.com>
Date:   Thu Oct 10 14:13:27 2013 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/wget

 wget.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc wget.spec
index da49a3b,31d9cda..f981f5a
--- a/wget.spec
+++ b/wget.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: A utility for retrieving files using the HTTP or FTP protocols
  Name: wget
  Version: 1.14
--Release: 9%{?dist}
++Release: 10%{?dist}
  License: GPLv3+
  Group: Applications/Internet
  Url: http://www.gnu.org/software/wget/
@@@ -88,9 -86,9 +88,12 @@@ rm -rf $RPM_BUILD_ROO
  %{_infodir}/*
  
  %changelog
- * Thu Oct 10 2013 Tomas Hozza <thozza at redhat.com> - 1.14-9
++* Thu Oct 10 2013 Tomas Hozza <thozza at redhat.com> - 1.14-10
 +- remove excessive line for '-nv' option in the manpage (#1017106)
 +
+ * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14-9
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Mon Jul 15 2013 Tomas Hozza <thozza at redhat.com> - 1.14-8
  - Fix deadcode and possible use of NULL in vprintf (#913153)
  - Add documentation for --regex-type and --preserve-permissions