7335ed Rebase to 3.6.0

Authored and Committed by Daniel P. Berrange 7 years ago
    Rebase to 3.6.0
    
    Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
    
        
file modified
+55 -11
file modified
+1 -1