Merge branch 'master' of git.ardour.org:ardour/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Sat, 23 Mar 2013 00:28:42 +0000 (20:28 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Sat, 23 Mar 2013 00:28:42 +0000 (20:28 -0400)
commit0348f9543e7a1d9366fc220dbf297532f2360dd2
tree25bcd4f86be97d7ad6aef284a15c96bc598049a7
parent7a3e9032caaf23e956688c7f33a4eb2a92a57ceb
parent268553ecd471e31d0a1a3976f02389260130e41d
Merge branch 'master' of git.ardour.org:ardour/ardour