62e994c Rebase to latest upstream version (0.94.2)

Authored and Committed by branto 8 years ago
    Rebase to latest upstream version (0.94.2)
    
    Resolves: rhbz#1229924
    
        
file modified
+5 -4
file modified
+1 -2