Merge branch 'master' of git.ardour.org:ardour/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Mon, 8 Apr 2013 13:30:49 +0000 (09:30 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 8 Apr 2013 13:30:49 +0000 (09:30 -0400)
commit0a20a850be42728d9a166ddc067815542b4f2e24
tree16974397c737902c4eeec3ec734ee9064362104b
parent23cac60a2fc817df6b8c7e06a5f2c286d3918e80
parentbec5882dbb5e3b85127c72a4fbfbc4e69564d218
Merge branch 'master' of git.ardour.org:ardour/ardour