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

[Nikos Mavrogiannopoulos]

commit 8279f901ad6eb388b53fba64c01272d7c7f00161
Merge: 033fe04 18c47c8
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Fri Jun 6 17:53:46 2014 +0200

    Merge branch 'master' into epel7

 ocserv-genkey  |   32 ++++++++++++++++++++++++++++++++
 ocserv.conf    |    2 +-
 ocserv.service |    1 +
 ocserv.spec    |   37 +++++++++----------------------------
 4 files changed, 43 insertions(+), 29 deletions(-)
---