bc95a59 Merge remote-tracking branch 'origin/f18'

Merged and Committed by pavlix 11 years ago
    Merge remote-tracking branch 'origin/f18'
    
    Conflicts:
    	strongswan.spec
    
        
file modified
+4 -3