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)

Trivial merge