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

Conflicts:
	msn/editprofiledialog.cpp
	msn/msn.pro
Merge branch 'master' of https://github.com/Frumba/QiQi

Conflicts:
	msn/chatwindow.ui
dasad\[aspofiohgvbohierinip
vdpspjgsojpgisojpgsk[ogsr
~~
ICI ON TRAVAILLE SERIEUX OK ?!