SVN_SILENT made messages (.desktop file)
SVN_SILENT made messages (.desktop file)
KDE SC 4.11.1
SVN_SILENT made messages (.desktop file)
Set version for KDE SC 4.11.2
SVN_SILENT made messages (.desktop file)
Do not allow overwriting bare jid of myself account in jabber client

Kopete account id and myself contact id cannot be changed. This means that all
jabber code must use bare jid for myself contact specified in account dialog.
Jabber server can change user jid after successfull login, but there is no
way in Kopete to propage it. So allow changing only of resource name and do not
tell other Kopete code about bare jid changes (which is account id and myself
contact id). Chaning resource name is OK. Without this patch it is not possible
to login to jabber servers which chaning bare jid (e.g facebook).

BUG: 324937
FIXED-IN: 4.11.3
KDE SC 4.11.3
Update libiris from https://github.com/psi-im/iris.git commit e1e776b5b7752dca7b9383677850f72dc7375fdb

Ignore /[\r\n]+/ in vcard base64 photo

CCBUG: 324937
Merge branch 'KDE/4.12'
Jabber libiris library: Ignore /[\r\n]+/ in vcard base64 photo

CCBUG: 324937
SVN_SILENT made messages (.desktop file)
SVN_SILENT made messages (.desktop file)
Prepare for 4.12 beta 2
Merge remote-tracking branch 'origin/KDE/4.12'

Conflicts:
	libkopete/kopeteversion.h
SVN_SILENT made messages (.desktop file)
SVN_SILENT made messages (.desktop file)
Fix broken merge 3faf14c6606e97b4cd98d73f694faabb223e0896

CC: aacid@kde.org
Scale very big contact pictures in tooltip to max size 96x96

Note that max-width/max-height in style attributes not working
so use width/height attributes for scaling. When is used only one
size attribute then aspect ratio is not changed.
Merge branch 'KDE/4.12' into master