3807a5 Merge commit '9a75430f62cfde14a061ef86cd7e3d7ce3f91ea1'

Merged and Committed by Karsten Hopp 12 years ago
    Merge commit '9a75430f62cfde14a061ef86cd7e3d7ce3f91ea1'
    
    Conflicts:
    	vim.spec
    
        
file added
+94
file added
+60
file added
+57
file added
+64
file added
+140
file added
+129
file added
+56
file added
+103
file added
+46
file added
+55
file added
+59
file added
+59
file added
+171
file added
+81
file added
+50
file added
+52
file added
+53
file added
+46
file added
+101
file added
+356
file added
+73
file added
+47
file added
+321
file added
+51
file added
+55
file added
+1090
file added
+73
file added
+55
file added
+81
file added
+359
file added
+54
file added
+52
file added
+53
file added
+125
file added
+160
file added
+494
file added
+582
file added
+85
file added
+52
file added
+232
file added
+70
file modified
+41 -0
file modified
+1 -2
file modified
+87 -2