Merge remote-tracking branch 'origin/KDE/4.13'

Conflicts:
	VERSION
	core/version.h
remotes/origin/KDE/4.14
Albert Astals Cid 12 years ago
commit ba37418a13

Diff Content Not Available