128f0e Merge remote-tracking branch 'origin/master' into f21

Merged and Committed by jskarvad 5 years ago
    Merge remote-tracking branch 'origin/master' into f21
    
    Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
    
    Conflicts:
    	gr-fcdproplus.spec
    
        
file modified
+1 -1
file modified
+9 -3