92bcc3c Merge branch 'master' into f17

Merged and Committed by Stanislav Ochotnicky 12 years ago
1 file changed. 6 lines added. 4 lines removed.
    Merge branch 'master' into f17
    
    Conflicts:
    	xmlrpc3.spec
    
        
file modified
+6 -4