Merge branch 'master' of https://github.com/derAbgang/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 3 Jan 2014 17:18:36 +0000 (12:18 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 3 Jan 2014 17:18:36 +0000 (12:18 -0500)

Trivial merge