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)
commit4d599b3da1ff8fa5fa172be32fbd14d0ba25b915
tree661fe82e1b44120534d758aab5bea675031dd0d6
parent0e3c2af69aba177725870532e9a79e176c4b5dc4
parent85fe8e9feeccfde9444ff3256a71069a45c87ed1
Merge branch 'nphilipp-master--nphilipp'