Merge branch 'master' into windows
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 1 Aug 2013 14:46:44 +0000 (10:46 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 1 Aug 2013 14:46:44 +0000 (10:46 -0400)
commitc98fcb62fb7daf5f52098dfe5ad4e68e71ddfe70
tree3f31e6503e6a457d930ef1bf105088c62e4d7f7f
parentbb8cb93789b2eec65e4d82e5ceb64054673cbc4f
parent28f3d76e7cd66a2b62b51eb640235cc3952da3e2
Merge branch 'master' into windows