18b1f95 Merge branch 'f21' into f20

Merged and Committed by limb 9 years ago
    Merge branch 'f21' into f20
    
    Conflicts:
    	openvpn.spec
    	sources
    
        
file modified
+4 -0
file modified
+24 -8
file modified
+3 -2