[ocserv/f19: 13/14] Merge branch 'master' into f19

[Nikos Mavrogiannopoulos]

commit ffdaf522643a19065dbee8200527954600f3b0f3
Merge: fd1d412 ad60bc8
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Wed Jan 29 10:05:41 2014 +0100

    Merge branch 'master' into f19

 .gitignore                |    1 +
 ocserv.conf               |   13 ++++++---
 ocserv.service            |    4 ++-
 ocserv.spec               |   64 ++++++++++++++++++++++++++++++++++++++++-----
 org.infradead.ocserv.conf |   14 ++++++++++
 sources                   |    2 +-
 6 files changed, 85 insertions(+), 13 deletions(-)
---