e50f801 Merge remote-tracking branch 'origin/master' into f14/master

Merged and Committed by rebus 13 years ago
    Merge remote-tracking branch 'origin/master' into f14/master
    
    Conflicts:
    	.gitignore
    	openvas-client.spec
    
        
file modified
+3 -2
file modified
+21 -5
file modified
+1 -1