32eb615 Merge branch 'master' into f21

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