Merge branch 'nick-prefix-buffer'
Merge branch 'smp-utf8'
Merge branch 'silent-drops'

Conflicts:
	weechat_otr.py