4c89ba3 Conflicts: libkpeople (#1208946)

Authored and Committed by Rex Dieter 9 years ago
    Conflicts: libkpeople (#1208946)
    
        
file modified
+10 -1