2cbc813 Merge branch 'master' into f14

Merged and Committed by madko 13 years ago
    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	darktable.spec
    	sources
    
        
file modified
+4 -0
file modified
+23 -9
file modified
+4 -0