bfbc8f1 Merge branch 'f18'

Merged and Committed by limb 11 years ago
    Merge branch 'f18'
    
    Conflicts:
    	libupnp.spec
    
        
file modified
+1 -0
file modified
+3 -3
file modified
+1 -1