Merge branch 'master' of git@git.ardour.org:ardour/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Sun, 9 Jun 2013 17:13:53 +0000 (13:13 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Sun, 9 Jun 2013 17:13:53 +0000 (13:13 -0400)
commite1802c9971a127085ec2c5889806df8cfae48068
tree11580a61422f65d58cb8ac13d081480b88e3a699
parent98019ccc22f80514779c3a05682444e80cb05943
parent3942eec0e9a30ce9422b4a46ccc2ab70cc88be8a
Merge branch 'master' of git@git.ardour.org:ardour/ardour