[merb]

actually they always merge via -no-ff. and time tracking in issue's is also a ee only thing. actually the last releases were pretty much focused on ee-only stuff, it's sad that it will be more closed caused by the money.