3ce7905 Merge remote-tracking branch 'nresare/testlib-tests'

Merged and Committed by mizdebsk 8 years ago
    Merge remote-tracking branch 'nresare/testlib-tests'
    
    Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>
    
    Conflicts:
    	guava.spec
    
        
file modified
+27 -8