Merge branch 'master' of git.ardour.org:ardour/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Sun, 31 Mar 2013 13:35:15 +0000 (09:35 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Sun, 31 Mar 2013 13:35:15 +0000 (09:35 -0400)
commit2ddbf6cd56ff8fb3c7f7b54d5da0d30bc83f83bd
treeff1f207a02d8c962d8c66f2627de246ede1277fb
parent8388e82fd39fc8babf09a5ff6a968f073ddf4a7c
parent69d70bca3752d84740270903f414de94da2e2464
Merge branch 'master' of git.ardour.org:ardour/ardour