c51d8a7 Merge branch 'master' of ssh://pkgs.fedoraproject.org/openconnect

Merged and Committed by David Woodhouse 13 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/openconnect
    
    Conflicts:
    	openconnect.spec
    
        
file modified
+10 -1