8236d26 Merge branch 'f20' into f19

Merged and Committed by bruno 10 years ago
    Merge branch 'f20' into f19
    
    Merge is needed because f19 doesn't have an f20 mass rebuild
    changelog entry that the f20 and master branches have.
    
        
file modified
+1 -1
file modified
+4 -1