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

[Nikos Mavrogiannopoulos]

commit 5d09f5345d1dab0801eb2b50410abdc99fa86afe
Merge: 58b3228 502c2d2
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Thu Apr 10 14:45:23 2014 +0200

    Merge branch 'master' into epel7

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