[packages/apache: 2/2] Merge branch 'feat/restart-delay-parameter'

[glen]

commit a6b18f70980f59814e6b6e2547f22e8af8860d5c
Merge: 9095ea9 00ab488
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Oct 9 09:49:54 2014 +0300

    Merge branch 'feat/restart-delay-parameter'

 apache.init      | 2 ++
 apache.spec      | 2 +-
 apache.sysconfig | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc apache.spec
index c9b0129,c9b0129..a1c7b46
--- a/apache.spec
+++ b/apache.spec
@@@ -34,7 -34,7 +34,7 @@@ Summary(ru.UTF-8):	Самый попу�
  Summary(tr.UTF-8):	Lider WWW tarayıcı
  Name:		apache
  Version:	2.4.10
--Release:	2
++Release:	3
  License:	Apache v2.0
  Group:		Networking/Daemons/HTTP
  Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/apache.git/commitdiff/a6b18f70980f59814e6b6e2547f22e8af8860d5c