Merge remote-tracking branch 'origin/Applications/16.12'

author Albert Astals Cid <aacid@kde.org>

Sat, 21 Jan 2017 00:38:26 +0000 (01:38 +0100)

committer Albert Astals Cid <aacid@kde.org>

Sat, 21 Jan 2017 00:38:26 +0000 (01:38 +0100)
author Albert Astals Cid <aacid@kde.org>
Sat, 21 Jan 2017 00:38:26 +0000 (01:38 +0100)
committer Albert Astals Cid <aacid@kde.org>
Sat, 21 Jan 2017 00:38:26 +0000 (01:38 +0100)
diff --cc src/kitemviews/private/kbaloorolesprovider.cpp
Simple merge
author	Albert Astals Cid <aacid@kde.org>
	Sat, 21 Jan 2017 00:38:26 +0000 (01:38 +0100)
committer	Albert Astals Cid <aacid@kde.org>
	Sat, 21 Jan 2017 00:38:26 +0000 (01:38 +0100)