1c7b1a0 Merge remote-tracking branch 'origin/f21'

Merged and Committed by lkundrak 9 years ago
    Merge remote-tracking branch 'origin/f21'
    
    Align with f21. It has an extra patch and fixed release number.
    
    Conflicts:
    	NetworkManager-openvpn.spec
    
        
file modified
+9 -2