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

[Peter Robinson]

commit a34a1861efd540678d11e8021e1a9f67a8eb5e8d
Merge: 6f6e3c9 8a7554e
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Feb 16 15:58:59 2015 +0000

    Merge branch 'master' into f22

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