[konquest/frameworks] /: Merge remote-tracking branch 'origin/master' into frameworks

[Luigi Toscano]

Git commit 2ba06fc4d58ed8b8b34fc648de799f0d7316cd45 by Luigi Toscano.
Committed on 08/04/2017 at 20:58.
Pushed by ltoscano into branch 'frameworks'.

Merge remote-tracking branch 'origin/master' into frameworks

M  +0    -13   doc/index.docbook
R  +2    -2    org.kde.konquest.desktop

https://commits.kde.org/konquest/2ba06fc4d58ed8b8b34fc648de799f0d7316cd45