Merge branch 'master' of git.ardour.org:ardour/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 3 Apr 2013 18:16:42 +0000 (14:16 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 3 Apr 2013 18:16:42 +0000 (14:16 -0400)
commitda260ef5f997b38f33b6729d4c6481889460b5f2
tree23f4a8e9317ad9877c23be5ede2afbda0322cff0
parente510aed38d386fd7f444fdde106fbefb1eeb1502
parent47efae83d1a48bcafa4e79a10c7ee99ae01b923d
Merge branch 'master' of git.ardour.org:ardour/ardour