18089bf Merge branch 'f20' of ssh://pkgs.fedoraproject.org/openvpn into f20

Merged and Committed by limb 9 years ago
1 file changed. 5 lines added. 0 lines removed.
    Merge branch 'f20' of ssh://pkgs.fedoraproject.org/openvpn into f20
    
    Conflicts:
    	openvpn.spec
    
        
file modified
+5 -0