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

[Nikos Mavrogiannopoulos]

commit a57067d845558a6f041ad48509e81b60e28c8158
Merge: d77a201 ad60bc8
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Wed Jan 29 09:36:44 2014 +0100

    Merge branch 'master' into f20

 ocserv.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---