r
Merge branch 'master' of https://github.com/Frumba/QiQi

Conflicts:
	msn/chatwindow.cpp
	msn/chatwindow.h
	msn/client.h
	msn/messengerform.cpp