removed :::
merged

Merge branch 'master' of github.com:edwindj/ffbase

Conflicts:
	pkg/NEWS