8c23073 respin patch (conflicts in the changelog)

Authored and Committed by mathstuf 8 years ago
    respin patch (conflicts in the changelog)
    
        
file modified
+66 -63
file modified
+1 -0