none will read this commit summary
Merge branch 'master' of github.com:kajamite/cola

Conflicts:
	cola.gemspec