4b07e1c Merge branch 'rhbz1109442'

Merged and Committed by mizdebsk 9 years ago
1 file changed. 9 lines added. 7 lines removed.
    Merge branch 'rhbz1109442'
    
    Conflicts:
    	guava.spec
    
        
file modified
+9 -7