Merge branch 'master' of git.ardour.org:ardour/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Sun, 24 Mar 2013 21:06:46 +0000 (17:06 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Sun, 24 Mar 2013 21:06:46 +0000 (17:06 -0400)
commit52363ebefd165916fa6ba1e4ffb6f0cc5ac436c3
tree0420a244551ac8880e46e08de472c11cd22dc0d8
parentcf98b72c23396747d85d67e921ebc5a49061262b
parent010a75d389fe0d7c42d93733af6d02d985d039ec
Merge branch 'master' of git.ardour.org:ardour/ardour