f09b92d Merge branch 'f19'

Merged and Committed by kiilerix 10 years ago
    Merge branch 'f19'
    
    Conflicts:
    	tortoisehg.spec
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+10 -5