Merge branch 'wip/trackball-rotation'
authorPeter Hutterer <peter.hutterer@who-t.net>
Sun, 15 May 2016 23:22:15 +0000 (09:22 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Sun, 15 May 2016 23:22:15 +0000 (09:22 +1000)

Trivial merge