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

[Nikos Mavrogiannopoulos]

commit 72b4cd9c4fb71694a39a6de66a74bf30e408fc06
Merge: 8a765c1 948b6e7
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Tue Aug 5 10:08:56 2014 +0200

    Merge branch 'master' into f21

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