Richard Hansen <rhansen@xxxxxxx> writes: >> Ping? I'd like to merge fc/contrib-bzr.hg-fixes topic to 'next' >> (and fast track it to 'master' after that), and it would be helpful >> to get an Ack on the conflict resolution I have. > > Sorry for the delay. > > Looks good to me, and the tests still pass. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html