Merge branch 'master' of git.ardour.org:ardour/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 28 Mar 2013 13:56:31 +0000 (09:56 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 28 Mar 2013 13:56:31 +0000 (09:56 -0400)
commitb47e71f8ac96e9a6e3beb76f3b7cf1001946aea8
tree0a304cb75fe4007e8021c78fda4e32804e0bcf57
parent74d54ae7396c2f879b224f5a36bbbc4e4da4d478
parenta1429ed39f142ccf8cde558891cbe59ca97a9922
Merge branch 'master' of git.ardour.org:ardour/ardour