chromium
Merge branch 'master' of github.com:seanpringle/xoat

Conflicts:
	config.h
Merge branch 'master' of github.com:seanpringle/xoat

Conflicts:
	config.h
action_maximise