.
Merge branch 'master' of github.com:matthiasbruns/QTwitt

Conflicts:
	QTwitt/QTwitt.pro.user