81e7828 Merge branch 'master' into f13

Merged and Committed by Jan ONDREJ (SAL) 13 years ago
    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    
        
file removed
-1
file modified
+13 -7
file modified
+1 -1