From kde-commits  Tue Jan 31 22:41:43 2017
From: Christoph Feck <null () kde ! org>
Date: Tue, 31 Jan 2017 22:41:43 +0000
To: kde-commits
Subject: [simon] /: Merge remote-tracking branch 'origin/windows'
Message-Id: <E1cYh7P-0006ag-OW () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=148590251331241

Git commit a3840c19666a93a7687ca2565bda63ed18327610 by Christoph Feck.
Committed on 31/01/2017 at 22:29.
Pushed by cfeck into branch 'master'.

Merge remote-tracking branch 'origin/windows'


https://commits.kde.org/simon/a3840c19666a93a7687ca2565bda63ed18327610