12e9af3 Merge jenkins spec file

Merged and Committed by mizdebsk 10 years ago
    Merge jenkins spec file
    
    Conflicts:
    	xmvn.spec
    
        
file added
+58
file modified
+16 -18