Merge branch 'smp-utf8'
Merge branch 'silent-drops'

Conflicts:
	weechat_otr.py
Merge branch 'str-format'

Conflicts:
	weechat_otr.py