another branches reshuffling

[Ivan Cukic]

> Not sure if you're allowed to change history in a public repo. That
> might be blocked (though replacing the branch probably is fine).

No, I didn't think to change the history - just to make a patch for master 
(the same as for the active-development/4.7 branch) and commit it instead 
of merging back into master. (a lot of stuff were merged from master into 
a-d/master and it would probably make the history of master a bit ugly)


-- 
While you were hanging yourself on someone else's words
Dying to believe in what you heard
I was staring straight into the shining sun
    -- Pink Floyd