Merge branch 'query-lineending'

Conflicts:
	test/test_weechat_otr.py
Merge branch 'current-buffer'
Merge branch 'sanitize'

Conflicts:
	test/test_weechat_otr.py
Merge branch 'action-support'

Conflicts:
	test/test_weechat_otr.py
	weechat_otr.py