8890a8c Merge branch 'master' into el4

Merged and Committed by bojan 13 years ago
    Merge branch 'master' into el4
    
    Conflicts:
    	.gitignore
    	sources
    	viewvc.spec
    
        
file modified
+5 -1
file modified
+1 -1
file modified
+6 -0
file modified
+13 -1