6107ac8 Merge remote-tracking branch 'origin/f20' into f19

Merged and Committed by corsepiu 10 years ago
    Merge remote-tracking branch 'origin/f20' into f19
    
        
file modified
+1 -1
file modified
+6 -1
file modified
+1 -1