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

Conflicts:
	VERSION
	core/version.h
This commit is contained in:
Albert Astals Cid 2014-04-19 13:15:12 +02:00
commit 67a2a1222c

Diff content is not available