d2ea7bf Merge branch 'f15'

Merged and Committed by fabiand 13 years ago
1 file changed. 4 lines added. 1 lines removed.
    Merge branch 'f15'
    
    Conflicts:
    	orc.spec
    
    Signed-off-by: Fabian Deutsch <fabian.deutsch@gmx.de>
    
        
file modified
+4 -1