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

[Nikos Mavrogiannopoulos]

commit e9c90a9c8083620f0fe639f3235e28fe74fb9300
Merge: 43a3679 87ad881
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Fri May 9 11:16:13 2014 +0200

    Merge branch 'master' into epel7

 .gitignore  |    1 +
 ocserv.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---