Merge branch 'wip/logitech-marble-mouse-middleemulation'
authorPeter Hutterer <peter.hutterer@who-t.net>
Tue, 21 Feb 2017 21:56:07 +0000 (07:56 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Tue, 21 Feb 2017 21:56:07 +0000 (07:56 +1000)

Trivial merge