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

[Nikos Mavrogiannopoulos]

commit 4417010ca3cf158461fae35809fda61e2ed55af9
Merge: 5a22d7c 502c2d2
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Fri Apr 11 12:49:47 2014 +0200

    Merge branch 'master' into f20

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