Merge branch 'nphilipp-master--nphilipp'
authorPaul Davis <paul@linuxaudiosystems.com>
Mon, 23 Nov 2015 13:42:23 +0000 (08:42 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 23 Nov 2015 13:42:23 +0000 (08:42 -0500)

Trivial merge