Merge branch 'master' into newer
merge info
Merge branch 'newer' of github.com:trestles/f2 into newer
Merge branch 'master' into newer
updated ehre
other information
Merge branch 'newer' of github.com:trestles/f2 into something
my update
Merge branch 'something'

Conflicts:
	some.txt