more testing to ignore
Merge branch 'master' of github.com:leo-editor/leo-bzr-test

Conflicts:
	del.me

resolved by fixing