cab87bd rebase to v0.6.1

Authored and Committed by erig0 5 years ago
    rebase to v0.6.1
    
    Resolves: rhbz 1614048
    
        
file modified
+1 -0
file modified
+6 -3
file modified
+1 -1