Hi Heikki, I am getting conflicts applying version 22 of this patch to 9.4dev. Could you rebase?
Does anyone know of an easy way to apply an external patch through git, so I can get git-style merge conflict markers, rather than getting patch's reject file? Cheers, Jeff
