89106bf Merge remote-tracking branch 'origin/f13/master'

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