Merge branch 'nofilemanager'
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 10 Dec 2014 23:29:41 +0000 (18:29 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 10 Dec 2014 23:29:41 +0000 (18:29 -0500)

Trivial merge