d33e9b2 Merge branch 'f19'

Merged and Committed by ajax 11 years ago
    Merge branch 'f19'
    
    Conflicts:
    	.gitignore
    	sources
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1