1d8da7 Merge commit 'd275e0f2b7db817a08236733e0c11041e1000589'

Merged and Committed by Mikolaj Izdebski 10 years ago
    Merge commit 'd275e0f2b7db817a08236733e0c11041e1000589'
    
    Conflicts:
    	batik.spec
    
        
file modified
+4 -1
file modified
+1 -1