local git commit
bzr add
Merge branch 'bzr/master'