a897862 Merge branch 'f16'

Merged and Committed by BenoƮt Marcelin 12 years ago
    Merge branch 'f16'
    
    Conflicts:
    	.gitignore
    	gbrainy.spec
    	sources
    
        
file modified
+1 -3
file modified
+5 -4
file modified
+2 -3