OSDN Git Service

Merge branch 'master' into usertracking
authorAdriaan de Groot <groot@kde.org>
Tue, 21 Nov 2017 12:29:49 +0000 (07:29 -0500)
committerAdriaan de Groot <groot@kde.org>
Tue, 21 Nov 2017 12:29:49 +0000 (07:29 -0500)

Trivial merge