d5c3b71 - fix file conflicts with gnupg

Authored and Committed by rdieter 17 years ago
1 file changed. 19 lines added. 5 lines removed.
    - fix file conflicts with gnupg
    
        
file modified
+19 -5