Merge branch 'Applications/16.12'

author Elvis Angelaccio <elvis.angelaccio@kde.org>

Sat, 21 Jan 2017 22:43:09 +0000 (23:43 +0100)

committer Elvis Angelaccio <elvis.angelaccio@kde.org>

Sat, 21 Jan 2017 22:43:09 +0000 (23:43 +0100)
author Elvis Angelaccio <elvis.angelaccio@kde.org>
Sat, 21 Jan 2017 22:43:09 +0000 (23:43 +0100)
committer Elvis Angelaccio <elvis.angelaccio@kde.org>
Sat, 21 Jan 2017 22:43:09 +0000 (23:43 +0100)
diff --cc src/panels/information/informationpanelcontent.cpp
Simple merge
author	Elvis Angelaccio <elvis.angelaccio@kde.org>
	Sat, 21 Jan 2017 22:43:09 +0000 (23:43 +0100)
committer	Elvis Angelaccio <elvis.angelaccio@kde.org>
	Sat, 21 Jan 2017 22:43:09 +0000 (23:43 +0100)