22e1d78 Merge remote-tracking branch 'origin/el5/master'

Merged and Committed by Stjepan Gros 13 years ago
1 file changed. 0 lines added. 2 lines removed.
    Merge remote-tracking branch 'origin/el5/master'
    
    Conflicts:
    	.gitignore
    	ndisc6.spec
    	sources
    
    Manually resolved conflicts.
    
        
file modified
+0 -2