Merge branch 'KDE/4.12' into KDE/4.13

author Frank Reininghaus <frank78ac@googlemail.com>

Mon, 14 Apr 2014 21:11:00 +0000 (23:11 +0200)

committer Frank Reininghaus <frank78ac@googlemail.com>

Mon, 14 Apr 2014 21:11:00 +0000 (23:11 +0200)
author Frank Reininghaus <frank78ac@googlemail.com>
Mon, 14 Apr 2014 21:11:00 +0000 (23:11 +0200)
committer Frank Reininghaus <frank78ac@googlemail.com>
Mon, 14 Apr 2014 21:11:00 +0000 (23:11 +0200)
diff --cc src/kitemviews/kstandarditemlistwidget.cpp
Simple merge
author	Frank Reininghaus <frank78ac@googlemail.com>
	Mon, 14 Apr 2014 21:11:00 +0000 (23:11 +0200)
committer	Frank Reininghaus <frank78ac@googlemail.com>
	Mon, 14 Apr 2014 21:11:00 +0000 (23:11 +0200)