5e23d94 Merge remote-tracking branch 'origin/master' into el6/master

Merged and Committed by rdieter 13 years ago
    Merge remote-tracking branch 'origin/master' into el6/master
    
    Conflicts:
    	.gitignore
    	sources
    	wxMaxima.spec
    
        
file modified
+1 -1
file modified
+1 -1
file modified
+27 -11