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

[Nikos Mavrogiannopoulos]

commit 1b404d70ad263104927cd18d0202d350492de40d
Merge: 98f237e 87ad881
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Fri May 9 12:03:05 2014 +0200

    Merge branch 'master' into f20

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