commit 6a2e41b37e285352c1ec39b382b9b4d02ec0fc7d Merge: e0d05d7 ef8e174 Author: Nikos Mavrogiannopoulos <nmav at redhat.com> Date: Mon Dec 16 10:58:09 2013 +0100 Merge branch 'f20' of ssh://pkgs.fedoraproject.org/ocserv into f20 ---