Merge branch 'br1'
delte since br1 2
br2 1
br2 2
br2 3
Merge branch 'br2'
Revert "br2 2"

This reverts commit b93e585d9eea629960fce84036a54b1c4933519e.

Conflicts:
	test
br3 1
br3 2
br3 3
Merge branch 'br3'
Revert "Merge branch 'br3'"

This reverts commit d8f699deef73ed2b37fd598e45c6ece45227aa39, reversing
changes made to 07fd8722112b61f7d55a36390ebb14bfce00f31b.
QA a=1
master a=2
master a=1
master a=2
master 213
br1 213w