c30570b Merge branch 'jenkins'

Merged and Committed by msrb 9 years ago
    Merge branch 'jenkins'
    
    Conflicts:
    	javapackages-tools.spec
    
        
file added
+58
file modified
+46 -37