[ocserv/f20: 4/4] Merge branch 'master' into f20

[Nikos Mavrogiannopoulos]

commit 9b0fe558563f6bf561a155e9c4c90f1a837b3b23
Merge: a57067d 2e7890b
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Mon Feb 17 08:43:48 2014 +0100

    Merge branch 'master' into f20

 .gitignore  |    1 +
 ocserv.conf |   20 ++++++++++----------
 ocserv.spec |    5 ++++-
 sources     |    2 +-
 4 files changed, 16 insertions(+), 12 deletions(-)
---