On 02/21/2013 04:54 PM, Oswald Buddenhagen wrote: > i'll simply block the merge, and i don't even need to resort to my pet > process reasons for that. Ok, we will delay the merge/rebase until Lars is back and can resolve this conflict. -- Eskil