bc77d2e Merge branch 'master' into f13

Merged and Committed by Jeroen van Meeuwen (Ergo Project) 13 years ago
    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    
        
file added
+101
file modified
+1 -0