[ocserv/f19] (11 commits) ...Merge branch 'f20' into f19

[Nikos Mavrogiannopoulos]

Summary of changes:

  ef8e174... compile with any version of libopts (*)
  6a2e41b... Merge branch 'f20' of ssh://pkgs.fedoraproject.org/ocserv i (*)
  b0f3ef3... Merge branch 'master' into f20 (*)
  2b24629... Merge branch 'master' into f20 (*)
  d77a201... Merge branch 'master' into f20 (*)
  a57067d... Merge branch 'master' into f20 (*)
  4835271... new upstream release (*)
  8afbd58... fixes in default config (*)
  2e7890b... more config updates (*)
  9b0fe55... Merge branch 'master' into f20 (*)
  042266c... Merge branch 'f20' into f19

(*) This commit already existed in another branch; no separate mail sent