Merge branch 'master' of git.ardour.org:ardour/ardour
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 7 Jun 2013 17:16:45 +0000 (13:16 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 7 Jun 2013 17:16:45 +0000 (13:16 -0400)
commit327ec5f58e58224e01004ddfd0252a840a0e84f0
tree1f951870896eab48de357b893392ccb0678cf374
parent5d691c1a2a13cb5ce131abdc8acfb65e5d9bae77
parent676a23e0319970021963fcb0d4964e7d714de1ea
Merge branch 'master' of git.ardour.org:ardour/ardour