4d062a Merge branch 'forge-parent-31'

Merged and Committed by Mikolaj Izdebski 11 years ago
    Merge branch 'forge-parent-31'
    
    Conflicts:
    	forge-parent.spec
    
        
file modified
+21 -47
file modified
+2 -1