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

[Nikos Mavrogiannopoulos]

commit 5a22d7c9e4c804f0d4841fd9c45ea995d3d58a46
Merge: 9b0fe55 bacae63
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Mon Mar 17 09:57:50 2014 +0100

    Merge branch 'master' into f20

 .gitignore  |    1 +
 ocserv.conf |    2 +-
 ocserv.spec |   18 +++++++++++-------
 sources     |    2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)
---