Fix MessageFormatter::formatNick()
ZncManager: generalize server-time handling (weechat compatible)
Merge branch 'master' into sailfish

Conflicts:
	messageformatter.cpp