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

Conflicts:
	VERSION
	core/version.h
This commit is contained in:
Albert Astals Cid 2014-07-15 23:11:21 +02:00
commit b205c3899e

Diff content is not available