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)
commit050d46a33e80be0e9ac88788a7f6a06442fb7c55
treedbb6bfba564d2979c8cebbfebe162a9659dff5aa
parenta25d945c3e31ddffbf8c5eccd6e6415ff6012c68
parenta4273ee2247caeb32c3ea1f9ddd6b0fac67e95de
Merge branch 'nofilemanager'