Merge branch 'master' of git.ardour.org:ardour/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Sun, 31 Mar 2013 21:02:07 +0000 (17:02 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Sun, 31 Mar 2013 21:02:07 +0000 (17:02 -0400)
commitb27a89d1dc4585c3c39196e25dc7948034a37e7d
treea68a3bdc26884189810abbb604228a86c8c90777
parent41708d39b9eceb68d27e017291f6eb7c4956c0b3
parentb9d22839f12cbac94ddfd5f2ce438d375a3bcdc0
Merge branch 'master' of git.ardour.org:ardour/ardour