f14431a Merge branch 'master' into f17

Merged and Committed by hannes 11 years ago
    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	sources
    
    merged master
    
        
file modified
+1 -0
file modified
+1 -1