1
Merge branch 'master' of https://github.com/alex977/qtrtt

Conflicts:
	glossary/qt-glossary.utf8
	omegat/project_stats.txt
1