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

[Nikos Mavrogiannopoulos]

commit 033fe045e7482674ad3a7f5ba7deff8ca755bdb4
Merge: 989e8c6 86abe99
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Mon Jun 2 09:34:59 2014 +0200

    Merge branch 'master' into epel7

 .gitignore                    |    2 +
 ocserv-0.8.0-cmp.patch        |   13 +++++++
 ocserv-0.8.0-endianness.patch |   70 +++++++++++++++++++++++++++++++++++++++++
 ocserv.conf                   |    7 +---
 ocserv.spec                   |   10 +++++-
 sources                       |    4 +-
 6 files changed, 98 insertions(+), 8 deletions(-)
---