CEST UN BEAU MULET
HMM LE BON MULET
Merge branch 'master' of https://github.com/Frumba/QiQi

Conflicts:
	msn/messengerform.cpp
	msn/resources.qrc