fix rejoining to the password protected groupchat when reconnecting
fix color button in opt_appearance (via issue 436 from psi-plus)
Fixed QLabel CVE
Fixed ui tab-stop compile warning
fix online contacts count
disable rename of general group
selectable application version in aboutdlg
reset selection in muc roster
reset not complete connection on status changes
sort by jid at discodlg
fix privates group in roster
iris updated
iris update
Merge branch 'master' of ssh://dev.psi-im.org/home/psi/git/psi
always off for muc roster's horizontal scrollbar
point submodules to github
git submodule uris changed to public ones to make users happy.
For developers:
Execute next line for each module in module's dir
git remote add push git@github.com:psi-im/modulename.git
where modulename is iris or libpsi
via: http://help.github.com/submodules/
Fixed regression in zlib.qcm
Provide zlib.h to iris from libpsi on windows

regression was introduced in recent zlib qcm refactoring
and now fixed.
Added OTHER_FILES to psi.pro for convenience