Merge proposals dependent on lp://staging/~ian-clatworthy/bzr/log-file-tweaks

lp://staging/~ian-clatworthy/bzr/log-file-tweaks has no merge proposals.