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

Conflicts:
	VERSION
	core/version.h
This commit is contained in:
Albert Astals Cid 2014-03-25 20:26:40 +01:00
commit 8dc2b23de6

Diff content is not available