[ocserv/epel7: 6/6] Merge branch 'master' into epel7

[Nikos Mavrogiannopoulos]

commit 634aff4c5982cc12b48bb5da24a1d438484ef7b2
Merge: 817148e 9d295c6
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Mon Jan 27 11:46:43 2014 +0100

    Merge branch 'master' into epel7
    
    Conflicts:
    	ocserv.spec

 ocserv.spec |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --cc ocserv.spec
index 174868b,bc27917..fc50f0f
--- a/ocserv.spec
+++ b/ocserv.spec
@@@ -28,8 -28,9 +28,9 @@@ BuildRequires:	libnl3-deve
  BuildRequires:	readline-devel
  BuildRequires:	dbus-devel
  BuildRequires:	autogen
- #BuildRequires:	pcllib-devel, http-parser-devel
- BuildRequires:  tcp_wrappers-devel
 -BuildRequires:	pcllib-devel
 -BuildRequires:	http-parser-devel
++#BuildRequires:	pcllib-devel
++#BuildRequires:	http-parser-devel
+ BuildRequires:	tcp_wrappers-devel
  BuildRequires:	automake, autoconf
  
  Requires:		gnutls-utils