On 05/29/2012 09:05 PM, Joseph S. Myers wrote: > On Tue, 29 May 2012, Christian Bruel wrote: > >> So I tested the following semantics, with the ones that you pointed. > > Thanks for the testing. The patch is OK with the ChangeLog conflict > markers removed (and the dates on log entries updated to the date of > commit). >
Thanks, committed on trunk.